Chapter 5 Finished

Branch for Chapter 5
Merge branch 'Chapter5'
Chapter 7 Commit
Merge branch 'Chapter6'