Assignment 2 from Andrew McConachie
Assignment 2
Merge pull request #84 from smutt/master

Assignment 2 from Andrew McConachie