1
merged
Merge pull request #1 from WYShine/master

add user