Merge branch 'master' into ZombieStorage
Merge branch 'master' into ZombieStorage
Merge branch 'master' into ZombieStorage
Merge branch 'master' into ZombieStorage
enable undo redo for update
Converted Strings in ZombieTaskCommandHandler.java to <html>
Merge branch 'master' into mainlogic

Conflicts:
	src/zombietask/ZombieTaskCommandHandler.java
Merge branch 'UI' into mainlogic
Merge branch 'master' into ZombieStorage
Merge remote-tracking branch 'origin/master'
latest semi-stable v0.4
Merge branch 'master' into ZombieStorage
update help command
update delete functions for undo
Merge branch 'mainlogic'
Merge branch 'master' into ZombieStorage
enabled undo for update
update updates location
add clashed tasks notification during add command
Merge branch 'master' into ZombieStorage
edit undo text
change error in timedTask colour