notes
Merge branch 'staticconf' of github.com:dnephin/presentation into staticconf

Conflicts:
	notes
Update slides.