Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
添加视频链接
change layout
完成了一些冲突，更改了一些翻译，更改README.md里的进度为100%
Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'origin'
fix a bug
解决冲突
Merge branch 'ZeroLu-master'
解决冲突