Bitcoin midterm
Merge pull request #25 from mattflannery/master

Bitcoin midterm