Updating Rails
Merge branch 'master' of github.com:pgaspar/subzam