Holy Git committal Batman
Merge branch 'master' of github.com:heapsy/fredup.github.io into heapsy-master

Conflicts:
	manchester/github-workshop.md