aaa
Merge branch 'master' of https://github.com/dmcoin/diamondcoin

Conflicts:
	README.md