add gpg-video and slide for it
Merge branch 'master' of github.com:c3d2/cms

Conflicts:
	2014_08_20_az_conni/src/slides.tex