modified test json file
modified test json file
adding new test file, hyperlink format needs to be adjusted
Merge branch 'master' of https://github.com/binaryberry/map-to-the-future
in the process of adding short description column to Events
modified test json file
resolving minor merge conflict in mapbox.js
merge conflicts in mapboxjs and Australia json
created short description, reduced pop up size
Merge pull request #30 from binaryberry/master

created short description, reduced pop up size