diff --git a/README.md b/README.md
index edfa874..918c530 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 Team 32
 -------
 
-@Mics21    
-@MarauderXtreme
+Michael Schneider    
+Christoph Kepler
diff --git a/htdocs/index.html b/htdocs/index.html
index 3285dbf..32ea963 100644
--- a/htdocs/index.html
+++ b/htdocs/index.html
@@ -11,7 +11,7 @@
 
 		<!-- This is so meta -->
 		<meta name="description" content="This is the first excercise in WME 2016. TU Dresden." />
-		<meta name="author" content="Mics21, MarauderXtreme" />
+		<meta name="author" content="Michael Schneider, Christoph Kepler" />
 		<meta name="keywords" content="Much HTML5, So CSS3, Such JS, WOW" />
 
 		<!-- Keywords are obsolet since search machines don't process them anymore' -->
@@ -319,7 +319,7 @@ <h1>
 						This solution has been created by:
 					</p>
 					<p>
-						@Mics21 and @MarauderXtreme - Team 32
+						Michael Schneider and Christoph Kepler - Team 32
 					</p>
 				</div><!-- /footer right column -->
 				<div class="clearing"></div><!-- clear responsive footer -->
diff --git a/htdocs/php/parse.php b/htdocs/php/parse.php
index f44822b..804fca4 100644
--- a/htdocs/php/parse.php
+++ b/htdocs/php/parse.php
@@ -19,7 +19,7 @@
 
 		<!-- This is so meta -->
 		<meta name="description" content="This is the first excercise in WME 2016. TU Dresden." />
-		<meta name="author" content="Mics21, MarauderXtreme" />
+		<meta name="author" content="Michael Schneider, Christoph Kepler" />
 		<meta name="keywords" content="Much HTML5, So CSS3, Such JS, WOW" />
 
 		<!-- Keywords are obsolet since search machines don't process them anymore' -->
@@ -78,7 +78,7 @@
 						This solution has been created by:
 					</p>
 					<p>
-						@Mics21 and @MarauderXtreme - Team 32
+						Michael Schneider and Christoph Kepler - Team 32
 					</p>
 				</div><!-- /footer right column -->
 				<div class="clearing"></div><!-- clear responsive footer -->
diff --git a/htdocs/php/print.php b/htdocs/php/print.php
index d82bd3f..5670433 100644
--- a/htdocs/php/print.php
+++ b/htdocs/php/print.php
@@ -22,7 +22,7 @@
 
 		<!-- This is so meta -->
 		<meta name="description" content="This is the first excercise in WME 2016. TU Dresden." />
-		<meta name="author" content="Mics21, MarauderXtreme" />
+		<meta name="author" content="Michael Schneider, Christoph Kepler" />
 		<meta name="keywords" content="Much HTML5, So CSS3, Such JS, WOW" />
 
 		<!-- Keywords are obsolet since search machines don't process them anymore' -->
@@ -92,7 +92,7 @@
 						This solution has been created by:
 					</p>
 					<p>
-						@Mics21 and @MarauderXtreme - Team 32
+						Michael Schneider and Christoph Kepler - Team 32
 					</p>
 				</div><!-- /footer right column -->
 				<div class="clearing"></div><!-- clear responsive footer -->
diff --git a/htdocs/php/save.php b/htdocs/php/save.php
index cea209c..994e179 100644
--- a/htdocs/php/save.php
+++ b/htdocs/php/save.php
@@ -24,7 +24,7 @@
 
 		<!-- This is so meta -->
 		<meta name="description" content="This is the first excercise in WME 2016. TU Dresden." />
-		<meta name="author" content="Mics21, MarauderXtreme" />
+		<meta name="author" content="Michael Schneider, Christoph Kepler" />
 		<meta name="keywords" content="Much HTML5, So CSS3, Such JS, WOW" />
 
 		<!-- Keywords are obsolet since search machines don't process them anymore' -->
@@ -83,7 +83,7 @@
 						This solution has been created by:
 					</p>
 					<p>
-						@Mics21 and @MarauderXtreme - Team 32
+						Michael Schneider and Christoph Kepler - Team 32
 					</p>
 				</div><!-- /footer right column -->
 				<div class="clearing"></div><!-- clear responsive footer -->