added fog to gemfile, configured carrierwave to upload article logos to s3 by default
try to fix conflicts in gemfile.lock and fog.rb files