updated tagging
update the tagging to have a talent list with sub-categories
updated merge conflicts
Merge pull request #29 from pdarden/tagging

Tagging