"cambio msj"
Merge branch 'master' of https://github.com/vkger/pruebas.git

Conflicts:
	prueba.c