Tags functionality
Fixed Conflicts
Fixed Conflicts during the merge
Merge pull request #22 from albertodotcom/pranava

Tags functionality