Adding "Travel" button to Market Screen so players can return to universe
Made travel button on Market screen change to the universe screen, added buttons over each solar system.
Made travel button on Market screen change to the universe screen, added buttons over each solar system.
Merge master into alex/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/DisplayUniverseController.java
	src/main/java/edu/gatech/gem5/game/controllers/MarketController.java
	src/main/resources/market.fxml
Fixing errors created by previous merge
Merge master into alex/dev
Added warning popup when not all points are allotcated @
CharacterCreateController.java
Added a new dependency for ControlsFX @build.gradle
Merge remote-tracking branch 'origin/master' into james/dev
Made solar systems clickable, displays info screen of first planet on click, added getter/setter methods to SaveFile for solar system info
Merge master into alex/dev

Conflicts:
	src/main/java/edu/gatech/gem5/game/controllers/CharacterCreateController.java
This time I commited the right files. Also working on a prettier Marketplace interface.
Moved files around to correct packages
Merging master with new package changes.
Merge branch 'master' of https://github.com/gem-5/last-adventures into creston/dev

Conflicts:
	src/main/resources/market.fxml
Merge branch 'master' of https://github.com/gem-5/last-adventures into creston/dev
Fixed path errors after Jack's package layout change.
Minor changes to displayUniverse.css (button colors set to white text/black fill) and CreateCharacterController (checks for valid name first, then for any unallocated points.
Major style update. Sorry still no marketplace style. Also, added a story data file. Let's get some of that going.
Merge branch 'master' of https://github.com/gem-5/last-adventures into creston/dev