Assignment 6 from Andrew
Assignment 7 for Andrew
Merge pull request #184 from smutt/master

Assignment 6 from Andrew