xd
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/gamejam/entity/Entity.java
	src/gamejam/entity/EntityPlayer.java
	src/gamejam/level/LevelManager.java