Feature/menu

Conflicts:
	audio/AudioPlayer.java
	model/GameModel.java
	model/SongHandler.java
	model/gameState/MenuState.java

Menu now works togheter with the game. A lot of known bugs with audio player

model/SongHandler.java

@@ -54,11 +54,8 @@ public class SongHandler {
 	}
 	public void set(int i)
 	{
-		if(currentIndex != i)
-		{
-			currentIndex = i;
-			updatePlayer();
-		}
+		currentIndex = i;
+		updatePlayer();
 	}
 	public void set(SongInstance si)
 	{
@@ -112,11 +109,5 @@ public class SongHandler {
 		p.play();
 	}
 	
-	public void play(boolean b)
-	{
-		if(b)
-		{
-			p.play((int)currentSong.getSampleStart()*10);
-		}
-	}
+	
 }