HW7
HW7 overhaul
HW7 overhaul
Merge pull request #11 from juru13/hw7

HW7