Making a merge conflict.
Merge branch 'typo2' of https://github.com/brodul/ninja-riding-unicorn

Conflicts:
	README.md