Step 5 completed
Merge branch 'master' of github.com:tjclement/School-Assignments