can search for videos or photos
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_videos
Merge pull request #14 from dbcfoxes2014/search_videos

Search videos
going to take a break from this for now, its good enough
fixed merge
can search photos/videos/both and will display them correctly
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_videos
Merge pull request #15 from dbcfoxes2014/search_videos

Search videos
going to merge the master into this
need to pull from master
Videos are finally working with fancybox