Add code to change SS
Merge origin/bvu into bvu

Conflicts:
	src/spacetrader/controllers/GameController.java
Merge origin/bvu into bvu

Conflicts:
	src/spacetrader/controllers/GameController.java