updated update and done
Converted Strings in ZombieTaskCommandHandler.java to <html>
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/zombietask/ZombieTaskCommandHandler.java
Merge branch 'master' into mainlogic

Conflicts:
	src/zombietask/ZombieTaskCommandHandler.java
Merge branch 'UI' into mainlogic