Merge pull request #11 from binaryberry/master

added input form for uploading events. NB: end date not a required field
Merge pull request #12 from binaryberry/master

progressed sending form input - still ongoing
test commit
Merge branch 'master' of github.com:gypsydave5/map-to-the-future
Merge pull request #13 from binaryberry/master

refactored method that gives long lat a geojson-like format
Adds popups with data from the database
Merge pull request #14 from binaryberry/master

allowed data from event upload form to be saved to the database
Gemfile alterations
some sort of merge
Sets default value of enddate to start date if enddate is blank
added test layout and added a server path to dispay it
added test layout and added a server path to dispay it
changed map size
added cucumber tests for markers
fixed merge conflicts in Gemfile.lock