update gitignore
fix confilict
fix confilict
Merge branch 'master' of https://github.com/gabrieltong/rails-sc

Conflicts:
	.gitignore
	app/views/markets/_form.html.erb
	app/views/markets/show.html.erb
	app/views/people/index.html.erb
	db/schema.rb
市场导入客户的功能
完善客户的验证
添加院系模型