Это
Merge remote-tracking branch 'origin/master'

Conflicts:
	homework3/app/views/product.html
Add listeners to pair-slider. " -> '