pulling
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	src/mytasks/file/Task.java
Merge branch 'master' of https://github.com/cs2103aug2014-w09-1j/main

Conflicts:
	bin/.DS_Store
	src/mytasks/logic/LogicTest.java
make changes to search command and able to pass two test cases, but have conflict on comparing the printed output.
Conflict resolved for comparing printed output. Able to pass tests on search command.