Merge pull request #1 from brodul/typo

Fixing the typo in your README.
Making a merge conflict.
Merge branch 'typo2'

Conflicts:
	README.md