Merge pull request #32 from TandasCodeup/mitch

Mitch
Merge branch 'master' into mitch