Deleted unnecessary files
Merge branch 'develop' of https://github.com/emmawestman/dat255group3 into develop

Conflicts:
	dat255_group3/src/com/dat255_group3/model/Player.java