Added main
Added a new feature my feature
Added myfeature file
Merge branch 'myfeature' into develop, we have a new feature called my feature
Another feature not decided
Another feature no feature
Resolved
Merge branch 'master' of https://github.com/yuefei-zhu/Test into develop

Some commits in master are ahead
Merge branch 'master' of https://github.com/yuefei-zhu/Test into develop

heihei
Changed new file
Merge branch 'master' of https://github.com/yuefei-zhu/Test into develop

Conflicts:
	newfile
Merge pull request #1 from yuefei-zhu/develop

Develop