Added Task Duration Timer
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/event/EventHandler.java