Test Commit with conflict
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/platformer/game/Mario.java