Generating things
Merge branch 'master' of https://github.com/chris-wood/BitcoinPrivacyProject

Conflicts:
	boomerang/code/src/sim2.yaml