Assignment 3 from Andrew McConachie
Merge pull request #100 from smutt/master

Assignment 3 from Andrew McConachie