Player rendered at right position
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/entities/Player.class
	src/entities/Player.java