Merge branch 'linh-dev' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	src/todologApp/Parser.java
	src/todologApp/UserInterface.java
Merge commit '072972790af9b81aa466a4f0a83ff01e6fa4415c' into Ben's_branch

Conflicts:
	src/todologApp/Parser.java