second commit
Merge branch 'master' of https://github.com/CSC3710-TDG/CSC3710-P1