comes back
updates rails guides description
Merge remote-tracking branch 'upstream/master'