update workshop
Merge branch 'master' of github.com:TroisLiu/workshop

Conflicts:
	README.md