First version of question parser
Merge branch 'master' of github.com:11791-01/project-team01
Modify query annotator
Fix conflict
Add question root to query
Merge branch 'master' of github.com:11791-01/project-team01