update rails version
Merge remote-tracking branch 'upstream/master'
Merge pull request #6 from subicura/master

update rails version