add s3.yml to gitignore
Merge branch 'master' of https://github.com/iamcooc/sample_app