...
Merge branch 'gh-pages' of github.com:VincentTam/pandoc_slides into gh-pages

Conflicts:
	index.html
	index.mkd