realized that I hadn't actually commited my workspace
Merge branch 'master' of github.com:zwade/hack2014

no comment