Update README.md
commit
Merge remote-tracking branch 'albertshaw/master'

Conflicts:
	README.md