I think I have everything working.
Merge branch 'master' of https://github.com/L2Cash/CardinalCoin

Conflicts:
	cardinalcoin/src/checkpoints.cpp