more corrections
Merge branch 'master' of https://github.com/settrbrg/ColorAdventure
correction
Merge branch 'master' of https://github.com/settrbrg/ColorAdventure

Conflicts:
	core/src/com/settrbrg/coloradventure/MyGame.java