Week 4
Merge branch 'master' of https://github.com/Seneca-OOP344/20133notes