scaffolds
merge
merge
merge
merge
merge
Delete schema.rb
merge
merge
merge
merge
merge
merge
merge
merge
merge
merge
merge
merge
merge