Changed setUniverseController because there was a small error
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders