stupid stupid
Merge branch 'master' of https://github.com/kinneerc/bug-app
stupidx2