No atiende a mas de uno a la vez
Commit
Merge branch 'master' of https://github.com/leroygordo/gasolinera-pdvsa

Conflicts:
	bomba.c
	centro.c
Commit
Merge branch 'master' of https://github.com/leroygordo/gasolinera-pdvsa

Conflicts:
	bomba.c
lalala
Holis
Merge branch 'master' of https://github.com/leroygordo/gasolinera-pdvsa

Conflicts:
	centro.c
	distribucion.txt