Merge branch 'master' of github.com:Tillid/tiSlideshow
Merge branch 'master' of github.com:Tillid/tiSlideshow