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

third commit to add module 2 core gameplay functionality