添加php
Merge branch 'master' of https://github.com/melin/dockerfiles

Conflicts:
	images/nginx/Dockerfile