changes
Merge branch 'master' of https://github.com/martexcoin/martexcoin

Conflicts:
	README
	README.md