准备重构merge
Merge remote-tracking branch 'origin/another'
更新gitignore文件
Merge branch 'another'

Conflicts:
	.gitignore
	Gemfile.lock
	app/views/layouts/application.html.erb
Merge branch 'another'

Conflicts:
	app/views/layouts/application.html.erb
modified the database
modified the database and modified the upload files
little modified
......
change the model
Merge branch 'master' into carrierwave-version
更新某些文件