fix
Merge branch 'master' of git@github.com:SiantyX/JAVAMEDFREDRIK.git

Conflicts:
	Orbitual remake/src/game/Entity.java