big update to content
Merge pull request #1 from jeffrey-ng/master

big update to content