Switched back to Allman
Merge branch 'master' of https://github.com/TotalFreedom/MobArena

Conflicts:
	src/com/garbagemule/MobArena/MobArena.java