Merge pull request #45 from KellyBlack/black_dev

Minor word changes - updating the 2 Sep lecture
minor change
conflict
delete one repeated line
Merge pull request #27 from guangmingyao/yao_dev

Yao dev