ispravlenie stiley
model negotiation
Merge branch 'master' of https://github.com/geser6666/chem-technologiesCRM

Conflicts:
	Gemfile
	app/assets/stylesheets/custom.css.scss
	app/views/layouts/_header.html.erb
adding negotiation model
prodolgaem
prodolgaem
prodolgaem
ne ochen rabochee
rabotaet pokaz peregovorov
dobavlenie negotiation
o
Merge branch 'message-model' of https://github.com/geser6666/chem-technologiesCRM into message-model

Conflicts:
	app/views/negotiations/index.html.erb
	config/routes.rb
	spec/requests/negotiations_pages_spec.rb
ggg
add negot plus tests
prodolgaem
edit negot
Merge branch 'message-model'

Conflicts:
	app/controllers/clients_controller.rb
	app/models/client.rb
	app/models/contact_type.rb
	app/models/user.rb
	app/views/clients/_client.html.erb
	app/views/clients/_follow.html.erb
	app/views/clients/_unfollow.html.erb
	app/views/layouts/application.html.erb