Merge branch 'pretty-url'
Merge branch 'master' of https://github.com/ChromaBranding/kolore