fixed genPlanetStrings
Merge branch 'master' of https://github.com/Rrego6/space_traders into noora

Conflicts:
	SpaceTrader/src/helper/CommonHelper.java
Merge branch 'noora' of https://github.com/Rrego6/space_traders into noora