Added jQuery UI to technologies tab
added sidebar that goes in and out, with map moving (Wheeeee , WUHUUU)
YEY, I/mplemented sidebar, not working jet. Weird css error!
Merge branch 'master' of github.com:gypsydave5/map-to-the-future

Conflicts:
	lib/views/map_page.erb
Changes popup css to work on #map rather than .map
Merge branch 'master' of github.com:gypsydave5/map-to-the-future
Sorts out the css a bit
resizes the sidebar
added sidebar with functionality. IT'S ALIVEE git add -Agit add -A!
front end editing
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
Edits .gitignore. Removes presentation from version control
Seeing the map test updated to reflect change in the html
Removes console.logs, remnants from debugging
Fixed the Rspec tests to actually do some testing again
Passing test for sidebar contents added
Adds failing test for map initializing with no sidebar
Adds failing test for map initializing with no sidebar
Adds failing test for map to not have zoom controls