adding files and my slides
adding images
Merge branch 'master' of github.com:FOSSRIT/SFpresent

Conflicts:
	flock-slides.rst
	output/css/hovercraft.css
	output/index.html
	output/js/impress.js