Updated rails version
Merge branch 'master' of github.com:gruppe20/Prosjektside