Add title for em slide
Merge branch 'master' into gh-pages
Add em slide
Merge branch 'master' into gh-pages

Conflicts:
	slides.md