limited genre_list to 4
Merge branch 'frontend' of https://github.com/bobolinks-2014/browsin into frontend
mergin branches
Merge branch 'master' of https://github.com/bobolinks-2014/browsin into frontend
merging with master main
updated shift
changed rating title
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