SSH
Merge branch 'master' of github.com:herber523/workshop

Conflicts:
	README.md