Merge branch 'master' of https://github.com/prezi/stretchcon

Conflicts:
2014/package.json
json update