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.