校正2-4和4-1

校正2-4和4-1
Merge branch 'ChildhoodAndyCorrection'
Merge branch 'master' of https://github.com/CocoaChina-editors/Welcome-to-Swift