#50 fix bugs of nullpointer when input wrong task id
fix conflict
Merge remote-tracking branch 'origin/master' into update_logic

Conflicts:
	src/Logic.java
Merge branch 'master' of https://github.com/cs2103aug2014-w11-4j/main