Merge pull request #2 from douglascraigschmidt/master

Catching up the fork before starting the assignment