css first drafts
map centers now on the popup when the marker is clicked
Merge branch 'master' of github.com:gypsydave5/map-to-the-future

Conflicts:
	lib/public/scripts/map_box.js
working on centering on popup, changed mouseover to click on open popup
Merge pull request #31 from binaryberry/master

Geojson uploads now work with linked events and the latter are tested
frontend changes
added work_files
adding to layout experiment in work_files
centers on popup when marker is clicked, ignores the zoom level
Merge branch 'master' of github.com:gypsydave5/map-to-the-future
Fixed the test for linking events so that it moves the map before checking for content
frontend changes
deleted files/ cleanup
Mervé's work on the frontend folded into the main file.
Merge pull request #32 from binaryberry/master

added keynote presentation