pkg
Merge branch 'master' of github.com:suprMax/expressjs-boilerplate

Conflicts:
	package.json