add readme
resolve weird readme conflict?

Conflicts:
	README.md