Andrew McConachie Assignment 4
Merge pull request #131 from smutt/master

Andrew McConachie Assignment 4