changes for hw6
Merge pull request #6 from ettemaet/hw6

changes for hw6