missing dependencies
Merge branch 'master' of ssh://github.com/crishushu/scion-pathes

Conflicts:
	package.json

resolved conflict