Update README.md
Merge branch 'conflicts'

Conflicts Resolved:
	README.md