handing in assignment
Merge pull request #2 from timproctor/patch-1

handing in assignment