Merge pull request #1 from KINGoxlong/firstbranch

Create newfile merge confirm
edit on master of old file

ex edit on master of old file
sum edit2 on master of old file

ex edit2 on master of old file
Merge pull request #2 from KINGoxlong/firstbranch

Firstbranch pull 2
sum edit before pull 3

ex edit before pull 3
Merge pull request #3 from KINGoxlong/master

merge from master to branch