Fixed merge conflicts in gemfile, and required the correct gem 'googlecharts', in the politician controller