don't actually run this
Merge branch 'master' of https://github.com/rhavens/hackathon