modified:   src/Summarizer.java
Merge branch 'master' of github.com:vgtomahawk/NLPProject

Conflicts:
	Summarization/src/Summarizer.java

	modified:   src/Summarizer.java
	modified:   src/WordNetSimilarity.java
	modified:   src/Summarizer.java
Merge branch 'master' of github.com:vgtomahawk/NLPProject

Conflicts:
	Summarization/src/Summarizer.java

	modified:   src/Summarizer.java
	modified:   src/WordNetSimilarity.java
Merge branch 'master' of github.com:vgtomahawk/NLPProject