Enabled working slideshow functionality(need to figure out why ffmpeg shits bricks but still outputs)
fixed merge conflicts
Merge pull request #81 from dbcfoxes2014/slideshow_editor

Slideshow editor