#3 added from local
Merge branch 'master' of https://github.com/surlung/rebase-merge-demo

Conflicts:
	README.md