Merge remote-tracking branch 'origin/linh-dev' into Ben's_branch
Merge remote-tracking branch 'origin/Stanley's_Branch' into Ben's_branch
changed txt file name
Merge branch 'linh-dev' into vani's_branch
fix "edit <random string>" feedback
added delete done command and fixed the bug
fix floating task not in displayList error
Merge branch 'linh-dev' into vani's_branch
Changed command help to avoid auto scrolling
Finish CommandNumber, add exit command, add flipPages for floating task list
Merge branch 'linh-dev' into vani's_branch

Conflicts:
	src/todologApp/Parser.java
Parser support for commandDeleteDone
invisibility
changed the exception handling in CommandHelp
Merge commit '6c82d876bfbfe0cb9067614421f6e11419cd2f3f' into vani's_branch
add highlighting the focused task
Merge commit '5dabbafa8f617e32e214264a3e6d99923b2e5dc1' into vani's_branch
Changed CommandEdit to sort after adding
Clock, history, edit ,helpFrame and view changed
Merge branch 'Ben's_branch' into linh-dev

Conflicts:
	.classpath
	src/todologApp/UserInterface.java