Subject: emacs presentation using pydown

Description:
Merge branch 'master' of https://github.com/psachin/slides

Conflicts:
	pydown