Test merge with conflict.
Merge branch 'master' of https://github.com/snackycakes/PlatformerPOC

Conflicts:
	src/platformer/game/Mario.java