appbox/devbox shit
Merge branch 'master' of https://github.com/timothyrowan/homestead

Conflicts:
	Homestead.yaml