package.json minor edit
Merge branch 'master' of github.com:tiy-durham-june2014-frontend/team-blue