Progress will continue until the beatings have ceased.
Merge branch 'master' of github.com:qpfiffer/lair