making change that should cause merge issue
Merge branch 'master' of https://github.com/eweibust/dummy into eweibust-master

Conflicts:
	README