zhang first commit
Merge branch 'master' of github.com:mitsuhide1992/asmac_zj