go
gogogogo Merge branch 'master' of https://github.com/fcecin/scicoin

Conflicts:
	README.md