first commit on branch findSlotFillersApp
second commit, working on getting results from solr and filtering
CLI program to be run with command sbt 'run-main edu.knowitall.tac2013.findSlotFillersApp.findSlotFills entityName organizationOrPerson pathToOutputFile
Merge branch 'master' into findSlotFillersApp

Conflicts:
	build.sbt
Fixed double quotes in build.sbt
fixed typo in build.sbt
finally fixed last typo in build.sbt
edited findSlotFills.scala
renamed findSlotFills.scala FindSlotFills.scala and moved some resource files and changed the urls for them
Merge pull request #3 from jgilme1/findSlotFillersApp

Find slot fillers app
Merge branch 'master' into fields

Conflicts:
	build.sbt