Adding x-gif to slides
Merge remote-tracking branch 'origin/jsconfeu' into gh-pages

Conflicts:
	index.html