new railstutorial
Merging changes from other computer.
Merge branch 'master' of https://github.com/marcminor/learn-ruby