Merge branch 'master' of manuel-voegele.de:inf3

Conflicts:
	src/Parser.cs

src/Parser.cs

@@ -4,6 +4,7 @@ namespace WorldOfPeacecraft
 {
 	public class Parser
 	{
+<<<<<<< HEAD
 				
         public void setMe()
         {
@@ -91,6 +92,23 @@ namespace WorldOfPeacecraft
            
         }
 		
+=======
+		private string fromServer;
+		private string toServer;
+
+		public Parser ()
+		{
+			//TODO: Code.
+		}
+
+		public void convertIncoming(string fromServer){
+
+		}
+
+		public void convertOutgoing(string toServer){
+
+		}
+>>>>>>> 20a88c29d15ed7cb5318dad8ce3edaec3e278b0e
 	}
 }