initial commit for new rails app generation
fixed merge conflicts