PMD, checkstyle and findbugs fixes
PMD, checkstyle and findbugs fixes
JUnit added to test chaning the ship's inventory
JUnit added to test chaning the ship's inventory
Merge
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2
Maye...
Merge branch 'master' of https://github.com/gossipgirls/SpaceTraders2

Conflicts:
	src/models/Planet.java

I just want to push again!