Minor changes
Merging ours together. Still needs testing
Merge branch 'master' of https://github.com/AlejandroFrias/DSHW4