added adding controls
merged dev_LA into dev_NL
Xbox nonsensery
added a new powerup, energy topedo
Merge branch 'dev_AO' into dev
twerky twerky
fan
Merge branch 'dev' into dev_AO
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/FreezeBolt.cpp
	SpaceSumo/Freezer.h
 fixed small stuff
merged
Can now select weight class (sort of), joystick now fully supported.
finished the energy torpedo
Merge branch 'dev_LA' into dev
Multiplayer mumbo jumbo
merged yolo
merged swag
Merge branch 'dev' of https://github.com/Ryxali/SpaceSumo into dev

Conflicts:
	SpaceSumo/Game.cpp.orig
	SpaceSumo/SpaceManImp.cpp
Merge branch 'dev_LA' into dev

Conflicts:
	SpaceSumo/res/ResourceList.xoxo
Energy torpedo physix upgrade