update rails
Merge branch 'master' of https://github.com/murwins/streamity