init
Merge branch 'master' of https://github.com/shindo1687/rails1