Proofreading..
Merge remote-tracking branch 'upstream/master'
Proofread up to section 4.
Merge pull request #7 from jray319/master

Proofread up to section 4 by Jiho.