change markdown syntax
More changes
Merge branch 'conflict-generate'

Conflicts:
	README.md