Refactored save
fixed conflict

Conflicts:
	dat255_group3/src/com/dat255_group3/controller/MyGdxGameController.java
	dat255_group3/src/com/dat255_group3/controller/PlayerController.java
	dat255_group3/src/com/dat255_group3/model/MyGdxGame.java
	dat255_group3/src/com/dat255_group3/model/Player.java
	dat255_group3/src/com/dat255_group3/screen/GameOverScreen.java
	dat255_group3/src/com/dat255_group3/screen/StartScreen.java