Update README.md
Delete README.md
Merge branch 'master' into Tristan

Conflicts:
	README.md