test timer
Merge remote-tracking branch 'upstream/master'
optimized AidedColorDataBuilder. tests run in 1 minute
builder.py conflicts fixed
adding time measuring to builder.py tests, with pep8 compliance
starting docs and debugging python-bitcoinlib
README edits
fixed merge conflicts
advancing docs
advancing coloredcoinlib docs
Merge pull request #76 from maraoz/master

coloredcoinlib docs
Issue #6: Forgot about Aided
Merge branch '6b' of https://github.com/jimmysong/ngcccbase

Conflicts:
	coloredcoinlib/explorer.py