pulling
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into auto_complete
fixed conflicts
pulling
fixed conflicts
fixed bug where similar media wasn't loading. Also search checkboxes are modified
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into similar_media
Merge pull request #80 from dbcfoxes2014/similar_media

Similar media