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