Updated Getting Started and Dependencies sections
added capybara
added Gemfile.lock
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into specs
pulling from master
d Please enter a commit message to explain why this merge is necessary,
Add feature specs.
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
Merge pull request #44 from bobolinks-2014/specs

added capybara and home controller test
Merge pull request #49 from bobolinks-2014/controller

updated search controller
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 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