change markdown syntax
more readme fixes
Merge branch 'conflict-generate'

Conflicts:
	README.md