Merge pull request #10 from petemmitchell/chapter6

Chapter6
Merge pull request #11 from petemmitchell/chapter8

Chapter8
Merge branch 'master' of https://github.com/petemmitchell/portfolio into chapter8