add gem figaro and json'
add route for scene, add logic for scene show action
fix typo
Merge branch 'master' into show-scenes

Conflicts:
	Gemfile.lock
	app/views/geolocations/index.html.erb
fix merge conflicts in Gemfile.lock and index action in geolocations
fix typo
fix syntax error