assignment done
Merge pull request #1 from jodwyer/ass2

assignment done