_
Merge branch 'master' of github.com:leroygordo/gasolinera-pdvsa

Conflicts:
	bomba.c
	centro.c
	servidorConcurrente.c
LEEME