added vimeo gem for search functionality
added vimeo controller and routes
added and formatted routes
fixed merge conflict
clean up
workign search form without any display views
stuff in application controller
added view page for search results. Appropriate result is displayed
Merge pull request #7 from rmoshier/kristen

Kristen
added search page
fixed merge conflict sessions
Merge pull request #8 from rmoshier/rlm-tuesday

Rlm tuesday
add comment to gemfile
fixed merge conflicts in routes and session controller
Merge pull request #9 from rmoshier/rma_wed

Rma wed
what's going on?
resolve merge conflict in omniauth.rb
fix merge conflict in gem file