Code before packup day.
Merge branch 'master' of github.com:leroux/frisbot