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

Conflicts:
	src/todologApp/Controller.java
Nothing changed
Edited search command in parser
added search string feedback
changed the CommandSearch
Merge branch 'linh-dev' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	src/todologApp/Parser.java
	src/todologApp/ToDoListTableModel.java
Merge commit '849f869c67bb12457086b73014e074cbe286798e' into vani's_branch
Nothing changed
Merge branch 'linh-dev' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	.classpath
	src/todologApp/Controller.java
	src/todologApp/ToDoListTableModel.java
	src/todologApp/UserInterface.java
added libraries
added libraries
Edited Test Cases
Included Search Command
Edited parseTaskEnd
Edited Such that end time cannot be earlier than start time
Merge branch 'Ben's_branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	.classpath
Merge branch 'vani's_branch' of https://github.com/cs2103aug2014-t11-3j/main into Stanley's_Branch

Conflicts:
	.classpath
Merge commit 'edd8227c4689d0aa7cfec04613d1570756dfecbd' into Ben's_branch

Conflicts:
	.classpath
	src/todologApp/Parser.java