i did this
Merge branch 'master' into bar

Conflicts:
	README.md
Merge pull request #2 from sbrauer/bar

i did this