added some hashtergs to the templates
Merge branch 'master' of https://github.com/g-palmer/hashtags