made my changes
Merge branch 'master' of https://github.com/aipdx-wdim351/wdim351-inclass-week02

Conflicts:
	README.md
Merge branch 'master' of https://github.com/aipdx-wdim351/wdim351-inclass-week02

Conflicts:
	README.md