editing tags
Merge pull request #15 from JoshuaNotowitz/master

editing tags