HW6 updated
Merge pull request #12 from jz1584/master

HW6 from jz1584