added sidebar with functionality. IT'S ALIVEE git add -Agit add -A!
Merge branch 'master' of github.com:gypsydave5/map-to-the-future

Conflicts:
	lib/views/map_page.erb
Merge branch 'master' of github.com:gypsydave5/map-to-the-future