edit deploy
Merge origin/master

Conflicts:
	deploy.php