test commit
Merge pull request #1 from sbrauer/foo

test commit
Merge branch 'master' into bar

Conflicts:
	README.md