slider fade worked out, logo put in, side bar beginning to come together
slider and logo finished
Merge branch 'master' of https://github.com/gypsydave5/map-to-the-future

Conflicts:
	lib/views/map_page.erb
slider and logo finished