pulling
got video play button displaying over thumbnail.  it needs a lot of work but i think its a good start
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into select_clips_to_compile
fix merged
fixed merge
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into select_clips_to_compile
I suck at css
search multiple tags
add test for Clip model
Merge pull request #28 from dbcfoxes2014/testing_model_clip

add test for Clip model
searching for nothing displays error message
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_multiple
deleted search.js, it wasn't needed
Merge pull request #29 from dbcfoxes2014/search_multiple

Search multiple
Merge pull request #27 from dbcfoxes2014/select_clips_to_compile

Select clips to compile
modularized the editor so its more organized and stopped the editor from loading site wide
Merge branch 'master' into ffmpeg_integration