should be done
Merge branch 'prolog_talk' of https://github.com/fgc/reveal.js into prolog_talk

Conflicts:
	prologjs
die git...