Update
Merge branch 'gh-pages' of https://github.com/nitya/canyc into gh-pages

Conflicts:
	slides/index.html