revamped user tests. moving to pic tests
Removed ruby version
Merge pull request #24 from dbcfoxes2014/gemfile_update

Removed ruby version
add Pic Model tests
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into testing_model_pic
popular media displays without refreshing the page
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into popular_media_fix
Merge pull request #25 from dbcfoxes2014/testing_model_pic

Testing model pic
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into popular_media_fix
Merge pull request #26 from dbcfoxes2014/popular_media_fix

Popular media fix
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into select_clips_to_compile
I suck at css