Merge pull request #14 from dbcfoxes2014/search_videos

Search videos
can search photos/videos/both and will display them correctly
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_videos