bugs not fixed
Merge branch 'master' of github.com:11791-2/team-project2 into
Yulong/DependencyParse

Conflicts:
	project-team02/src/main/java/team2/NLPProc.java
added dependency parser
Merge branch 'master' of git@github.com:11791-2/team-project2.git