css
Merge branch 'master' of https://github.com/adrianopauli/td

Conflicts:
	desenvolviemnto/servidor/auto/static/css/style.css
	desenvolviemnto/servidor/auto/static/css/style.css~