fixed GUI
fixed conflicts & Merge branch 'master' into graphicscleanup

Conflicts:
	src/models/Game.java
	src/models/Player.java
models -> model, views -> view, tests merged into model