bug fixing
Merge branch 'master' of https://github.com/19jluis92/Vatos

Conflicts:
	controllers/CarWorkShopController.php