add commmandActionComplete
delete Json
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
rm TaskDo.json
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
Missed out one case for setting search mode
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
updateCategoryList now accepts a taskList and updates the CategoryList accordingly
add display range of date
Merge branch 'master' of github.com:cs2103aug2014-t17-1j/main
add update category in executor
delete json for merge
CategoryList has been updated

CategoryList has been updated
Fixed bug in categoryList
Color has been changed

Color has changed
Merge branch 'master' of https://github.com/cs2103aug2014-t17-1j/main
remove conflict
Someday has been fixed

Someday has been fixed