index fix
Merge branch 'milestone1' of https://github.com/unbornchikken/workflow-4-node into milestone1

Conflicts:
	package.json
package.json fixe