Initial commit
Merge branch 'master' of github.com:siggame/zeronet

Conflicts:
	README.md