Readme: Conflicting

Am I a conflicting cunny!
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.md