Merge pull request #2 from CharlieFaceButt/charlie-pc

commit chapter discuss version 20140512
Merge pull request #3 from CharlieFaceButt/charlie-pc

chapter
Merge branch 'master' into charlie-pc