initial commit!
Merge github.com:msusur/node-test

Conflicts:
	.gitignore