Checkstyle changes
Merge branch 'CheckStyle' of https://github.com/RockLobsters/Space-Traders into CheckStyle

Conflicts:
	SpaceTrader/src/spacetrader/ShipYardScreenController.java