receiving updates
Merge branch 'master' of https://github.com/nokswalk/CPSC304CoolTeam