third commit
Merge branch 'master' of https://github.com/JTMaher2/CSC-306-Project.git