Began re-branding
Merge branch 'master' of github.com:tnwae/colloquia