Clean up MaryBot.java
Merge branch 'master' of github.com:JayH5/hons-simulator

Conflicts:
	src/main/java/za/redbridge/simulator/MaryBot.java