changed readme
making trouble
Merge branch 'conflict-generate'

Conflicts:
	README.md