git shell tut updated
combined shen and yang
add papa and Chu
for pull
Merge branch 'master' of https://github.com/guoguo616/app into caixiaomo