Merges branch to master and pushes it
Merge branch 'master' of github.com:exchgr/ardeploy

Conflicts:
	deploy.js.coffee