chnages
changes in db yml
added logic for ratings
changes in gemfile
ratings nil rescue
changes
changes
changes
conflicts fixed