revamped user tests. moving to pic tests
add Pic Model tests
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into testing_model_pic
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