branch test
AMD simple
& simple
conflict fixed
add dev
merge with no-ff
fix bug 101
merged bug fix 101
Merge branch 'master' of https://github.com/longfeilove7/learngit