Added powerups, it's a bit of a disaster right now. This version should
never be run.
Fixed freezing issue (the position checking during creation was never
finding a spot since there were so many characters).
Testing
Changed sprite reset to the safe version.
Merge branch 'master' into dev

Conflicts:
	Makefile
stashing
Merge branch 'master' into dev

Conflicts:
	game.cpp
Fixed up conditions for reverting to hashtag sprite.
It doesn't actually change back, though no errors are returned.
Allowed boss to ignore collisions with shield (and not die).
Merge branch 'master' into dev
Update makefile