commit

Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images
merge

Merge branch 'master' of github.com:RossWittenberg/search_bar into quiz_images
changed 'zip_code' to 'location' on views and controller
resolved merge conflicts

Merge branch 'master' into quiz_images

Conflicts:
	app/views/application/index.html.erb
	app/views/bars/results.html.erb