ui shipyard
shipyard ui
Merge branch 'master' of https://github.com/Rrego6/space_traders into sarah
load game button only appears if game saved
buying gadgets
Merge branch 'master' of https://github.com/Rrego6/space_traders into ambrose
gadget actions
gadget purchasing
saving changes
Merge branch 'master' of https://github.com/Rrego6/space_traders

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
added credits field to buyship
Merge branch 'master' of https://github.com/Rrego6/space_traders
buy gadget ui
Merge branch 'master' of https://github.com/Rrego6/space_traders
Merge branch 'master' of https://github.com/Rrego6/space_traders into sarah
Merge branch 'sarah'
shipyard ui
added comments
Merge branch 'master' of https://github.com/Rrego6/space_traders
added weapon and shield