Merge remote-tracking branch 'origin/pre-playState' into develop

Conflicts:
	control/GameControl.java
	control/GameStateManager.java
	image/Images.java

control/GameStateManager.java

@@ -10,6 +10,7 @@ import model.gameState.GameState;
 import model.gameState.HelpState;
 import model.gameState.MenuState;
 import model.gameState.PlayState;
+import model.gameState.PreGameState;
 import model.gameState.TitleState;
 import control.button.Button;
 import control.button.ButtonEvent;
@@ -35,9 +36,10 @@ public class GameStateManager {
 		MENU_STATE,
 		HELP_STATE,
 		PLAY_STATE,
-		GAMEOVER_STATE
+		GAMEOVER_STATE,
+		PRE_GAME_STATE
 	}
-	
+
 	public GameStateManager(SongHandler sh, SQLConnector sql){
 		this.sh = sh;
 		gamestates = new ArrayList<>();
@@ -46,6 +48,7 @@ public class GameStateManager {
 		gamestates.add(new HelpState(this, sh, sql));
 		gamestates.add(new PlayState(this, sh, sql));
 		gamestates.add(new GameOverState(this, sh, sql));
+		gamestates.add(new PreGameState(this,sh));
 		setState(State.TITLE_STATE);
 	}