trying to get inputfield keyword highlighting working with ryan's commandcontroller
Merge remote-tracking branch 'origin/ryan/controller' into jolly/gui
debugging keywords with ryan's commandparser
Merge remote-tracking branch 'origin/ryan/controller' into jolly/gui
more bug fixes?
Merge remote-tracking branch 'origin/ryan/controller' into jolly/gui
Merge branch 'staging' of https://github.com/cs2103aug2014-w13-1c/main into jolly/gui
fixed import of controllers for InputFieldViewManager
stopped refreshing the tasklistview after every keypress
changed logging level for empty command
Merge remote-tracking branch 'origin/staging' into jolly/gui

Conflicts:
	.gitignore
created new keyworddector helper class
removed old code for computeHighlighting
got taskcontroller up with instant search working
search in commandcontroller now uses instantsearch in taskcontroller
Merge remote-tracking branch 'origin/ryan/controller' into jolly/gui

Conflicts:
	src/app/controllers/CommandController.java
	src/app/controllers/CommandParser.java
created parseKeywords in commandcontroller for use with keyword detection
Edited .gitignore
Merge branch 'staging' into ryan/controller

Conflicts:
	.gitignore
Moved getKeywords to CommandParser