committing HW5
Merge pull request #34 from savvytruffle/master

handing in hw5