tagging users
fixed adding tags but not removing
resolving conflict
Merge pull request #14 from JoshuaNotowitz/master

adding tags