Put everything in a Markdown README
Fix merge conflicts

Conflicts:
	README