updated the rails version
merged