Fix merge issue
Merge branch 'master' of https://github.com/cs2103aug2014-f11-1j/TaskCommander.git
Merge branch 'master' of https://github.com/cs2103aug2014-f11-1j/TaskCommander.git
Remove assert statements

and replaced them by proper if statements