working state machine
Merge branch 'master' of github.com:ppsirius/Rent_car

Conflicts:
	app/models/car.rb
Merge branch 'master' of github.com:ppsirius/Rent_car