new branch test
master mod
hotfix commit
Merge branch 'hotfix'

Conflicts:
	README
hotfix merge