autosave
Merge branch 'master' of github.com:glouppe/talk-cds2014

Conflicts:
	slides.pdf