stuff
Merge branch 'master' of https://github.com/shiyingzheng/shiying_ben_hw6
merge
took A out of test