commit before pull
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite
commit before pull
commit before pull
commit before pull
EventBrite SO CLOSE
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite
EventBrite SO CLOSE
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite
EventBrite SO CLOSE
routes fixed
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
dropdown menu to navigate to either photo/video editor
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into dropdown
deleted unneccessary JS file
Merge pull request #103 from dbcfoxes2014/dropdown

Dropdown
EventBrite SO CLOSE MORESO
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into eventbrite