Updated with license
Merge branch 'master' of https://github.com/poulsbopete/dockerwordpress

Conflicts:
	README.md