SSH New Workshop
Merge branch 'master' of github.com:clarencetw/workshop

Conflicts:
	README.md