SLight balance changes
Merge branch 'master' of github.com:cullensu/Capstone

Conflicts:
	game_src/src/project/ship/behavior/ShipBehaviorFactory.as
Balance
Merge branch 'master' of github.com:cullensu/Capstone