finished my section of the slides
Image for my slides
Merging in my section of presentation.
Hopefully the order isn't to bad.

Merge branch 'master' of github.com:FOSSRIT/SFpresent

Conflicts:
	flock-slides.rst