Update README
Merge branch 'master' of https://github.com/joelgrandin/wordpress

Conflicts:
	README.md