a
asdf
Merge branch 'master' of https://github.com/KeyHiro/TCSFP

Conflicts:
	controlador_autos.py
tararra