user edit changes
Merge pull request #17 from JoshuaNotowitz/master

user edit changes