working on rules
Merge branch 'master' of https://github.com/chiragchaplot/COMP30016

Conflicts:
	COMP30016/JUMPER/bin/gameengine.class