foo
merged
Merge branch 'master' into hk-my-branch

Conflicts:
	README.md