kurze outline
Merge branch 'master' of github.com:c3d2/sit-2013

Conflicts:
	src/slides.tex