Modified .gitignore
Changed server used, modified PosQueryAnnotator
Merge branch 'master' of github.com:11791-01/project-team01
Resolved conflict