M6 Progress
M6 Progress
M6 Progress
M6 Progress
character creation screen with ui update
M6 Progress
Merge branch 'ambrose'
Added Load Game Button, NO FUNCTIONALITY YET
JavaDoc
javadoc'd
Started to implement encounters

Conflicts:
	SpaceTrader/src/model/SolarSystem.java
changes to files
updated encounters and reputation
updated encounters and created battlescreen
updated encounters
Merge branch 'master' of https://github.com/Rrego6/space_traders into ivan

Conflicts:
	SpaceTrader/src/model/TradeGood.java
working on GameData
ui for save load game