merging fixes
Merge branch 'master' of https://github.com/AlejandroFrias/DSHW4