Using matchdep
Merge branch 'master' of github.com:francejs/effroi

Conflicts:
	package.json