JO
Merge branch 'master' of https://github.com/ser8phin/bitcoin-pres

Conflicts:
	bitcoins.pdf