Generate new rails app
Fix conflicts in .gitignore file