Merge branch 'master' into gh-pages
Merge branch 'FWYT-master' into gh-pages
Merge branch 'gh-pages' of https://github.com/ScottyLabs/crashcourse-website into gh-pages
Merge branch 'gh-pages' of https://github.com/ScottyLabs/crashcourse-website into gh-pages
Update workshops.html
changed taylor's md to html
Added CMU Robotics Club
Merge branch 'gh-pages' of https://github.com/ScottyLabs/crashcourse-website into gh-pages
Merge branch 'master' of https://github.com/ScottyLabs/crashcourse-website into gh-pages

Conflicts:
	workshops.html