Task 5 and 6
Merge branch 'master' of https://github.com/ScottDell/2014pre1