Clsoed #43: Adding Damage/Cooldown/MoveSpeed DropUpgrades
Merge branch 'master' of https://github.com/cullensu/Capstone

Conflicts:
	game_src/src/project/hud/HUD.as
	game_src/src/project/ship/PlayerShip.as
	game_src/src/project/state/GameState.as
Merged changes