schema.rb delete
gitignore
merge