initial rails app
conflict in .gitignore
conflicts