updating
Merge branch 'master' of github.com:Vendea/nodetest

Conflicts:
	index.js