fhshfsi
Merge branch 'master' of https://github.com/hale6666/janimcoin

Conflicts:
	src/util.cpp