Initial commit
Merge branch 'master' of github.com:ianwalter/basenode

Conflicts:
	.gitignore