started writign introduction for the landing sidebar
Merge branch 'master' of github.com:gypsydave5/map-to-the-future

Conflicts:
	lib/public/javascript/leaflet-sidebar-master/src/L.Control.Sidebar.css
Merge branch 'master' of github.com:gypsydave5/map-to-the-future
added introduction on first sidebar
Merge branch 'master' of github.com:gypsydave5/map-to-the-future
ditched the zoom-div changes
Merge branch 'master' of github.com:gypsydave5/map-to-the-future

Conflicts:
	lib/views/map_page.erb