test
Merge branch 'master' of https://github.com/friendshipCoin/friendshipCoin

Conflicts:
	src/checkpoints.cpp