Added code highlighting
Bug fix
Merge remote-tracking branch 'gh-code-snippets/master'

Conflicts:
	slides.tmpl.md
	static/slides.md
Added some code highlights