Javadoced Gadgets Controller
Javadoced Gadgets Controller
Merge branch 'master' of https://github.com/linalana/ProgrammingPirates

Conflicts:
	SpaceTrader/src/spacetrader/engine/GadgetsController.java