update
updateMerge https://github.com/abcoin/WhitePaper

Conflicts:
	ABCoinWhitePaper_en.pdf