add feature.txt to feature branch

haha
change a little
Merge branch 'feature'