Fixed an awful lot of bugs
Merge branch 'master' of https://github.com/Commander-lol/Zuul-Better-Project

Conflicts:
	entities/package.bluej
	package.bluej
	rooms/circular room of much confusion.kv
	state/Game.ctxt
	state/Game.java
	state/package.bluej