Merge branch 'master' of https://github.com/smith-john-cit260/smith-john-cit260-repo.git