new file:   src/main/java/uncc2014watsonsim/scoring/AllEngineResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/scoring/FAROOResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/scoring/GoogleResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/scoring/IndriResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/scoring/LuceneResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/scoring/QuestionResultsScorer.java
	new file:   src/main/java/uncc2014watsonsim/search/FAROOSearcher.java
Merge branch 'cgibso33' of https://github.com/SeanTater/uncc2014watsonsim into cgibso33

Conflicts:
	src/main/java/uncc2014watsonsim/search/FAROOSearcher.java
	.git/MERGE_HEAD

	modified:   src/main/java/uncc2014watsonsim/search/FAROOSearcher.java