wut
Merge branch 'master' of https://github.com/FightTheToast/BaconGameJam06

Conflicts:
	src/com/fightthetoast/BGJ6/screen/ScreenInGame.java