slideshow
Merge branch 'master' of https://github.com/SFPC/sfpc.github.io

Conflicts:
participate-2014.md
catching up
resolve