shortening tag delay
Merge branch 'master' into cats
new composer
Merge branch 'master' into cats
categories work, for the most part now