resolved issue#17
Merge remote-tracking branch 'origin/iss17'

Conflicts:
	src/main/java/uncc2014watsonsim/search/IndriSearcher.java
	src/main/java/uncc2014watsonsim/search/LuceneSearcher.java