5_18 commit
Merge branch 'master' of https://github.com/gpalmer1190/RepoResearchPA1