my second git commit
Merge branch 'thomas'
Merge branch 'master' of https://github.com/aipdx-wdim351/wdim351-inclass-week02