HW 1
Merge pull request #52 from patsywalsh/master

merged - HW 1