v1 commit
Merge branch 'master' of github.com:glopz/zslideshow