Multiple Choice 99%
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/nubiceria/schoollife/scenes/MainGameScene.java