price model
Merge branch 'master' of https://github.com/JanaVPetrova/company_site into price

Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
price changes
feedback