Merge branch 'master' of https://github.com/Shoemaker-William/cit260-project1.git