conflict
conflict line
Merge branch 'hotfix'

Conflicts:
	readme.txt