added jenny wong to the list
Added Joe Critchley (that's me)
Update github-workshop.md
Merge pull request #23 from missjwo/master

added my details to the list
phils git lesson was rockin/
Gareth's commit
Resolve conflict.
Holy Git committal Batman
Resolve conflict.
Resolve conflict
Add Chris Hale and Dave Mcpoland from https://github.com/fredup/fredup.github.io/pull/25
Merge branch 'master' of github.com:janetrimmer/fredup.github.io into janetrimmer-master

Conflicts:
	manchester/github-workshop.md
Merge branch 'master' of github.com:heapsy/fredup.github.io into heapsy-master

Conflicts:
	manchester/github-workshop.md
add event information to McrFRED home page