Partway through geolocation
Merge branch 'master' of github.com:paullainchbury/cheerups
Added styling
Merge branch 'master' of github.com:paullainchbury/cheerups

Conflicts:
	app/views/cheerups/index.html.erb
	app/views/layouts/application.html.erb