Edited SolarSystem so that resource and techLevel are ints, and so that it has a constructor that only takes in a name.
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
wrote awful planet solar system stuff
edited ui files by sarah
Merge branch 'master' of https://github.com/Rrego6/space_traders