Took off 12mid
Merge branch 'hackathon' of https://github.com/a17levine/blocktalk into hackathon

We're merging!