Merge remote-tracking branch 'slipson/master'

Conflicts:
	ZombieProjectModelClasses/src/zombieProject/shared/Map.java
Merge branch 'master' of git@github.com:coady/ZombieProject.git