Uh...graphics mostly work well now, I'd say
Merge branch 'master' of https://github.com/inb4ohnoes/bearnose-simulator

Conflicts:
	Entity.java
	World.java