Merge branch 'master' of https://github.com/arupaka/sabatora_html
S3で公開できるようにした
Merge pull request #2 from arupaka/s3

S3
Merge branch 'master' of https://github.com/arupaka/sabatora_html into template

Conflicts:
	Gemfile
	Gemfile.lock