Merge branch 'master' into ryan/controller

Conflicts:
	.classpath
Added time parser to update method
Trim the string in time parser method(s)
Add .json to .gitingore
Merge branch 'master' of https://github.com/DrJJ/watdo
Merge branch 'master' into ryan/controller

Conflicts:
	src/app/controllers/CommandController.java
Create command parser and command object classes
Working on comparators
Merge branch 'staging' into dat/model
Reverted TodoItemList.java
Created ModelManager and TodoItemSorter. Not safe to use yet.
solve conflict
Merge branch 'master' into ryan/controller
Completed commandParser and commandObject
Start to redo add controller
Merge branch 'staging' into ryan/controller

Conflicts:
	.gitignore
	src/app/controllers/CommandController.java
Preparing for revert
Revert "Preparing for revert"

This reverts commit 0919ea77c34364f4c07c4db6cc642f86af05a3f7.
Reverted
Created commandParser