update
Merge branch 'master' of github.com:GongT/my-bash-script

Conflicts:
	init.d/alias.sh
	ssh-proxy