Still doing commenting....
Change my two lines, I change your two lines
Merge branch 'staging' into ryan/controller
Fixed bug on update parsing (remove end date)
Merge pull request #261 from cs2103aug2014-w13-1c/ryan/controller

Fixed bug on update (remove end date) and halfway doing the commenting
Renamed startDateUpdated and endDateUpdated

into startDateKeyword and endDateKeyword
Merge branch 'staging' into ryan/controller
Merge pull request #262 from cs2103aug2014-w13-1c/ryan/controller

Renamed startDateUpdated and endDateUpdated into startDateKeyword and endDateKeyword
Finished commenting for my part! Yay!
More tests for ActionControllerUnits.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Merge pull request #263 from cs2103aug2014-w13-1c/ryan/controller

Finished commenting for my part! Yay!
Solve merge conflict
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui