organized divs
Merge branch 'figaro'; fix merge conflict

Conflicts:
	Gemfile.lock
Merge branch 'master' of https://github.com/MsUzoAgu/movie_app

Conflicts:
	app/controllers/geolocations_controller.rb
	app/models/api.rb
	app/views/geolocations/index.html.erb
	app/views/geolocations/show.html.erb
Fix merge conflicts