to fix
Merge branch 'master' of https://github.com/ppsirius/Rent_car

Conflicts:
	app/assets/javascripts/cars_sorting.js