Merge pull request #1 from colduchiha/master

new-file-edited
Merge pull request #2 from colduchiha/user

Merge pull request #1 from colduchiha/master