Initial Rails project
Fix conflicts