update from ssh
Merge branch 'master' of github.com:andrewintw/sitcon-workshop

Conflicts:
	README.md