.
Merge branch 'master' of https://github.com/mmartche/car

Conflicts:
	db/doc para importar bd
	db/scriptdb.php
	index.php
	styles/home.css