Modified the ffmpeg gem to do slideshows and merged in master
Merge branch 'master' into slideshow_editor
Merge pull request #102 from dbcfoxes2014/slideshow_editor

Slideshow editor