flatiron-rails generate and initial commit
Fix merge conflicts