saving changes
Merge branch 'master' of https://github.com/Rrego6/space_traders

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
Merge branch 'master' of https://github.com/Rrego6/space_traders
Merge branch 'master' of https://github.com/Rrego6/space_traders into sarah