Add tags and categories
Merge branch 'master' of github.com:rajivseelam/corcel