Refactors the playermodel
Fixes fail commit, see last commit message
Merge branch 'develop' of https://github.com/CrashIT14/ChalmersSpaceShooter into develop

Conflicts:
	src/lab1/SpaceShooterModel.java
Merge remote-tracking branch 'origin/develop' into develop