Updated Getting Started and Dependencies sections
Added formatting and getting started section
refactored search and user controllers for speed
refactored user and media models for speed
created user preference model and migration
fixed merge conflicts
removed merge confclits
updated models for new table
updated merge conflict
Merge pull request #46 from bobolinks-2014/controller

Controller
updated models for hidden status
Merge pull request #47 from bobolinks-2014/controller

updated models for hidden status
fixed controller
Merge pull request #48 from bobolinks-2014/controller

fixed controller
updated search controller
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
Merge pull request #50 from bobolinks-2014/readme

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