#50 fix bugs of nullpointer when input wrong task id
fix conflict
Update README.md

To include `completed` parameter for view. Now by default view command, only incomplete task will be shown. If user specify `completed` in `view`, then completed tasks will be shown.
Merge remote-tracking branch 'origin/search_logic'
Merge remote-tracking branch 'origin/master' into update_logic

Conflicts:
	src/Logic.java
Merge branch 'master' of https://github.com/cs2103aug2014-w11-4j/main
Merge branch 'search_logic'
Simplify VIEW & SEARCH methods
Add a helper method for MARK command

* Move validity of displayedId to the new method (the old one actually does not work because NullPointerException is thrown as early as in isCompletedTask)
Change LogicTest (due to changes in VIEW that it accepts a boolean isCompleted)
Refactor Logic.updateTask() to make it neater
Rename Logic.delete to Logic.deleteTask
Merge branch 'quality_control'
Let LogicTest.tearDown() reset the database
Remove redundant calls to deleteTask() in LogicTask as the database will be reset in tearDown()
Change LogicTest.searchKeywordTest to fit the new output formatting
Merge branch 'quality_control'