removed fog gem
s3 aws integration
merge conflict solved