commit of local change 1
Merge branch 'master' of github.com:mrbandrews/mrbandrews-test

Conflicts:
	README.md
commit 2 of local