M6 Progress
M6 Progress
M6 Progress
M6 Progress
character creation screen with ui update
M6 Progress
Merge branch 'ambrose'
JavaDoc
Started to implement encounters

Conflicts:
	SpaceTrader/src/model/SolarSystem.java