Update github-workshop.md
Merge branch 'master' of github.com:janetrimmer/fredup.github.io into janetrimmer-master

Conflicts:
	manchester/github-workshop.md