my first git commit!
bradner changes
Merge branch 'bradner'

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