Remove Files
Merge branch 'gh-pages' of https://github.com/uvicmakerlab/conferenceMaterials into gh-pages

Conflicts:
	kansas2013/scalarWorkshop/head.min.js
	kansas2013/scalarWorkshop/reveal.min.css
	kansas2013/scalarWorkshop/reveal.min.js
	kansas2013/scalarWorkshop/theme.css