Initial commit
Merge branch 'master' of github.com:geophoenix/npm2 into develop

Conflicts:
	.gitignore
	README.md