started learning uploading amazon s3
updated rails 3.2.15
Merge pull request #230 from fireweb/master

continue with 383