powerup stuff?
Merge branch 'dev' of https://github.com/Ryxali/SpaceSumo into dev

Conflicts:
	SpaceSumo/EnergyTorpedo.cpp
	SpaceSumo/Exploded.cpp
	SpaceSumo/Exploded.h