control
Merge branch 'master' of https://github.com/ruben01/SigeretRepositorio

Conflicts:
	SigeretSolucion/Sigeret/bin/Sigeret.dll
	SigeretSolucion/Sigeret/bin/Sigeret.pdb
	SigeretSolucion/Sigeret/obj/Debug/Sigeret.dll
	SigeretSolucion/Sigeret/obj/Debug/Sigeret.pdb