final changes to slides
Merge branch 'master' of github.com:dvorak42/pramb

Conflicts:
	slides/slides.tex