test commit
Merge branch 'master' of https://github.com/Xypus/Rental

Conflicts:
	app/views/cars/index.html.erb
	db/seeds.rb
Wicked forms for new car
Merge branch 'master' of https://github.com/Xypus/Rental

Conflicts:
	app/controllers/cars_controller.rb