exercises 7
Merge branch 'master' of https://github.com/jgscott/SSC383D