Merge branch 'master' of https://github.com/lisongyu/training into lisongyu-master

Conflicts:
	README.md
Merge branch 'lisongyu-master'
更新字体大小
Revert "更新字体大小"

This reverts commit ddacf69bd941c9c9000273a0debe6b1406708c86.
merge
update workflow
add commit -a command
add branch commnd
尝试gitGui提交更新
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
Update README.md
update conflict