-
Merge branch 'master' of https://github.com/microcoinsource/microcoin

Conflicts:
	src/main.cpp