discarded some changes
Merge branch 'master' of https://github.com/kobrighto/cs660.git

Conflicts:
	IRTermProject/src/main/java/org/apache/lucene/indexer/IndexFiles.java
fixed merge conflicts