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

Conflicts:
	inf3.csproj

src/Gui/Gui.cs

@@ -16,6 +16,8 @@ namespace WorldOfPeacecraft
 		private ChatPanel ChatPanel;
 		private OnlinePlayerList OnlinePlayerList;
 
+		private Music m = new Music();
+
 		public Gui ()
 		{
 			//AllocConsole();
@@ -62,6 +64,8 @@ namespace WorldOfPeacecraft
 			this.Controls.Add (ChatPanel);
 
 			this.ResumeLayout();
+
+			m.Playmusic ("overworld");
 		}
 
 		protected override void OnClosing (System.ComponentModel.CancelEventArgs e)

src/Gui/Splashscreen.cs

@@ -9,11 +9,12 @@ namespace WorldOfPeacecraft
 	{
 		private string ImagesFolder = "textures/";
 		private Image Logo;
+		private Music m = new Music();
 
 		public SplashScreen ()
 		{
 			Logo = Image.FromFile (ImagesFolder + "splashscreen.png");
-			//TODO: Play "splashscreen.ogg"
+			m.Playmusic ("splashscreen");
 		}
 
 		protected override void OnPaint (PaintEventArgs e)