new rails app
merged