merge conflict
merge conflict resolved
I am not sure what I changed
Merge branch 'master' of https://github.com/nokswalk/CPSC304CoolTeam