got a dummy response from solr
Merge branch 'master' of github.com:bsandquist1/tweetfix

Conflicts:
	build.sbt
added a bunch of stuff