Updated Getting Started and Dependencies sections
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into specs
Added formatting and getting started section
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into specs
pulled from master
fixing merge conflict
adding spec tests for user controllers and search controllers
Merge pull request #50 from bobolinks-2014/readme

Readme
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into specs
mergin with mastere
Merge pull request #51 from bobolinks-2014/specs

added tests for user and search controllers and features
updated controllers and models for user profile
updated search for user hidden media
updated user preference associations
updated user preferences table
updated view status in search controller
Merge pull request #53 from bobolinks-2014/user-preferences

User preferences
updated specs
finished omdb parser spec
fixed merge conflicts
Merge pull request #55 from bobolinks-2014/parser-spec

Parser spec
fixed merge conflicts