添加StraightMerge教程
Merge pull request #1 from zx491102/new-A

添加StraightMerge教程