added initial rails notes
fixed merge conflict