deleted extra gems
Merge branch 'master' into prod

Conflicts:
	Gemfile
	Gemfile.lock
	app/views/locations/index.html.erb