added a line
Merge branch 'issue' into master

Conflicts:
	README.md