package.json
Merge branch 'master' of github.com:robertjanzen/evidence

simple merge