Fixed checkstyle
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders
Merge branch 'master' of https://github.com/TeamOxygen/SpaceTraders
Replaced all tab indents with spaces. Drastically reduced number of checkstyle warnings