first commit
Merge branch 'master' of https://github.com/JustOneAndZero/solocoin

Conflicts:
	README.md
first commit

Merge branch 'master' of https://github.com/JustOneAndZero/solocoin

Conflicts:
	README.md