Started on starting a new game.
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	src/controller/GameController.java