HW1
Merge pull request #2 from savvytruffle/master

HW1 from savvytruffle