add feature file
update feature branch
add feature2
update develop
Merge branch 'develop' of https://github.com/scott1028/git_study into develop