fixed bug with images getting removed upon click
Merge branch 'master' of https://github.com/dbcfoxes2014/free_candy into search_results_grid
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
Merge pull request #16 from dbcfoxes2014/search_results_grid

Search results grid
Added unicorn in the Gemfile.
just viewing stuff
fixed known conflicts
cleaned up routes and commented code
Merge pull request #18 from dbcfoxes2014/cleaning_up

Cleaning up
Merge pull request #17 from dbcfoxes2014/joe_deploy

Added unicorn in the Gemfile.
popular media and search now render the same page
Merge pull request #19 from dbcfoxes2014/display_media

popular media and search now render the same page
Added rails 12 factor to gemfile to enable static asset serving.