set up rails
fix .gitignore merge conflict