java doc controllers
Merge branch 'master' of https://github.com/warpcorebreach/SpaceTrader