project tag changes
Merge branch 'master' of https://github.com/lasazawa/nameless
changes to tags
user edit change fixes
Merge pull request #18 from JoshuaNotowitz/master

user edit change fixes
project tags
Merge branch 'master' of https://github.com/lasazawa/nameless
adding josh's tag changes to user
adding tags to projects
resolving merge conflict