before we merge
david david
added the cookie funcitonality
merged with Dave's cool stuff
Map is working.
david messed
Merge branch 'master' of https://github.com/gabrielcatalin/libraryAtlas

Conflicts:
	css/main.css
	index.html
Merge branch 'master' of https://github.com/gabrielcatalin/libraryAtlas
Merge branch 'master' of https://github.com/gabrielcatalin/libraryAtlas
wrap in iframe
Merge branch 'master' of https://github.com/gabrielcatalin/libraryAtlas

Conflicts:
	css/main.css
	index.html
taking to fix map
David push
Merge branch 'master' of https://github.com/gabrielcatalin/libraryAtlas