slideshow + columns
Merge branch 'master' of https://github.com/teoinke/461fp