Merge pull request #1 from douglascraigschmidt/master

Catching up the fork before starting the assignment