not much change
Merge branch 'map'

Conflicts:
	app/views/index.erb
	app/views/layout.erb
	public/css/application.css