New Rails app
Fixed merge conflict in gitignore