x
upload
upl
Merge branch 'master' of github.com:ladisone/bin

Conflicts:
	vps.rb