Creating slides.
Creating slides.
Creating slides.
Creating slides.
Creating slides.
Merge branch 'master' into gh-pages

Conflicts:
	src/main/webapp/slides/2014.html