added enum ship
added enum ship
added enum shipMerge branch 'master' of https://github.com/Rrego6/space_traders into noora

Conflicts:
	SpaceTrader/src/helper/GameData.java
	SpaceTrader/src/model/Player.java
	SpaceTrader/src/model/Ship.java
Merge branch 'master' of https://github.com/Rrego6/space_traders into noora

Conflicts:
	SpaceTrader/res/txt/gameDataPlayer.json
	SpaceTrader/res/txt/gameDataUniverse.json
	SpaceTrader/src/helper/GameData.java
Merge branch 'noora'