el q va
Merge branch 'master' of https://github.com/Kito001/Almacen.git

Conflicts:
	Debug/HolaMundo
	Debug/saludo.o
	saludo.c