added player and entity, two classes i actually already added previously, but intelliJ is obviously a bit stupid
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/workspace.xml
moved some things around