user deit
user edit
Merge pull request #11 from bigwigGit/master

user edit