Fixed

Fixed some broken stuff!
Merge remote-tracking branch 'origin/master'

Conflicts:
	PokeShmup Final Build/PokeShmup Final Build.userprefs