modify on dev branch
merge dev without fast-forward
fix bug 101
fix bug 101
commit
modify learn.txt