further restructuring
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gamestates/PlayState.java