Merge branch 'jin/gui' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
Merge branch 'ryan/controller' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
added libraries for nlp for intellij
Added done support
Merge branch 'staging' into ryan/controller

Conflicts:
	watdo.iml