menu upgrade
added adding controls
merged dev_LA into dev_NL
Xbox nonsensery
added a new powerup, energy topedo
Merge branch 'dev' into dev_LA
Merge branch 'dev_AO' into dev
twerky twerky
SpaceMan improvements before test
fan
Merge branch 'dev' into dev_AO
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/FreezeBolt.cpp
	SpaceSumo/Freezer.h
 fixed small stuff
merged
Projectile fixes
Can now select weight class (sort of), joystick now fully supported.
finished the energy torpedo
Projectile direction improvements
Comment Removal
Merge branch 'dev_LA' into dev