initial rails commit
fixed merge conflict