Phase de resolution
Merge branch 'master' of https://github.com/Yakka/indiespeedrun

Conflicts:
	src/isr/GamePlay.java