stating php5-fpm on startup
Merge branch 'master' of https://github.com/zconkle/devbox

Conflicts:
	www/README.md