Adds remark about code to be removed
Adds remark about code to be removed
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk.git
Merge branch 'master' of https://github.com/a12tdt4240/grotrisk.git

Conflicts:
	Test Game/test-game/src/com/testgame/MyGame.java
	Test Game/test-game/src/com/testgame/Views/MainMenuScreen.java