get rid of localhost dependencies
Merge branch 'master' of github.com:branch14/geek-jeopardy

Conflicts:
	app/assets/javascripts/master.js.coffee