Merge branch 'master' of https://github.com/bobolinks-2014/browsin

Merging master
Merge branch 'master' of https://github.com/bobolinks-2014/browsin

merging master
Merge branch 'master' of https://github.com/bobolinks-2014/browsin

merging master
Merge branch 'master' of https://github.com/bobolinks-2014/browsin

merged master branch
Merge branch 'master' of https://github.com/bobolinks-2014/browsin

merging master
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into search_controller_spec
Updated search controller spec with new tags
added session testing
added search by title functionality
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into search_controller_spec
limited genre_list to 4
updated shift
Merge pull request #82 from bobolinks-2014/controller-refactor

limited genre_list to 3
Merge pull request #83 from bobolinks-2014/frontend

changed rating title
user feedback implemented
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into front-end-testing

merging master
removed swap file
functioning with first version of search
Merge pull request #84 from bobolinks-2014/front-end-testing

Front end testing
added media spec tests for title rating method