Add a readme
Merge in a better readme into master.

Conflicts:
	README.md