A
Merge branch 'develop' of
https://github.com/LinTim-Studio/poke-adventure into develop

Conflicts:
	src/pokeAdventure/game/gameStart.java