各種コードの修正
Merge branch 'master' of https://github.com/GRGSIBERIA/amazon-s3-test

Conflicts:
	app.rb
	.git/MERGE_HEAD

	modified:   app.rb