Merge branch 'max_dev' of Software_Engineering_I/greenvironment-frontend into master

src/app/components/about/about.component.sass

@@ -11,7 +11,11 @@
 #aboutcontainer
     @include gridPosition(2, 2,2,2)
     background-color: $cPrimaryBackground
+    padding: 1em
+
 input
     margin: 0.25em
 #header
     @include gridPosition(1, 2, 1, 2)
+a
+  color: $cHeadPrimaryBackground

src/app/components/imprint/imprint.component.html

@@ -1,8 +1,8 @@
 <div id="imprint">
   <div id="imprintcontainer">
     <h1>Imprint</h1>
-    <p>The greenvironment network is being developed by Bliblablub</p>
+    <p>The greenvironment network is being developed by the greenvironment team</p>
     <h2>Contact</h2>
-    <p>Email: mailadress</p>
+    <p>Email: nick.derkoenig@greenvironment.net</p>
   </div>
 </div>

src/app/components/imprint/imprint.component.sass

@@ -11,6 +11,8 @@
 #imprintcontainer
     @include gridPosition(2, 2,2,2)
     background-color: $cPrimaryBackground
+    padding: 1em
+    
 input
     margin: 0.25em
 #header