add new branch
modify in feather1
this is master checkout
conflict fixed
fixed bug
merge bug fixed
add hello.sh
Merge branch 'master' of https://github.com/renyapeng/learngit