Agrego la clase bus
Merge branch 'busapp'

Corregido el import

Conflicts:
	src/vehiculos.py
Merge branch 'master' into carro

Conflicts:
	src/vehiculos.py