Merge pull request #14 from JoshuaNotowitz/master

adding tags
Merge pull request #15 from JoshuaNotowitz/master

editing tags
am work
Merge pull request #16 from lessin/master

am work
user edit changes