first commit - startedr new rails app
fixed merge