commit B
Merge branch 'master' of https://github.com/kmorcinek/rebase-vs-merge

Conflicts:
	README.md
Initial commit again