incorporated willi's changes
cleaned up the first couple of slides
Stupid conflicts

Merge branch 'presentation'

Conflicts:
	presentation/presentation.tex