Fixed comment
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
updated comment for keyworddetectorservice
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
Merge branch 'staging' of github.com:cs2103aug2014-w13-1c/main into jin/gui
fixed enter executes last command even if input field is empty
Removed extra imports.
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into staging
Added done/undone integration test
Added integration test 0
LoggingServiceTest now passes its tests FOREVER.
Removed unused code
Merge pull request #264 from cs2103aug2014-w13-1c/jin/gui

Some integration tests
Merge branch 'staging' into ryan/controller