RoflCommit

The title says it all
Merge branch 'master' of https://github.com/brentwalther/Fanorona