added gitignore
Merge branch 'master' of github.com:wipa/hackathon
fixed rendering of json markers thanks to Tim Whitacre and no thanks to Grunt.