Prepping Gemfile for Heroku
updating for strings in search
Merge branch 'master' of https://github.com/dankleiman/api_reader

Conflicts:
	server.rb