updating several things
Merge branch 'master' of https://github.com/HarryDegz/HW4