gitignore db/schema.rb
Merge branch 'master' into add_tag
modify ignore files
Merge branch 'master' into add_tag
test