Code Java 5 compatible
Code compatible with Java 5
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim

Conflicts:
	.gitignore
	src/main/java/privatedata/UserSpecificConstants.java.sample
	src/main/java/uncc2014watsonsim/Answer.java
	src/main/java/uncc2014watsonsim/WatsonSim.java
	src/main/java/uncc2014watsonsim/search/IndriSearcher.java
	src/main/java/uncc2014watsonsim/search/Searcher.java
Merge branch 'master' of https://github.com/SeanTater/uncc2014watsonsim into development