fixed hw
Merge pull request #1 from quattro/master

incorporate these changes to complete assignment