Update README.md
Merge branch 'master' into my_new_branch

Conflicts:
	README.md
Merge pull request #5 from marcphilipp/my_new_branch

My new branch