Updated README and changed to markdown for markup

Conflicts:
	README.org