Added Week4, fixed some issues in Week2
Merge branch 'master' of https://github.com/zdavison/DIT.OOP1