Initial commit
new rails app
fixed merge error