requires 30 characters
Merge branch 'master' of github.com:southpolesteve/corgi