Nick's homework #1
Homework 1
Merge pull request #4 from nhuntwalker/master

Homework 1 pull request