package.json
Merge branch 'master' of github.com:thegoleffect/hapi-views