Cambios Luis Carlos
no se
cambio
no se
Merge branch 'master' of https://github.com/a71747/Inge2-Ple.git

Conflicts:
	A82559_B03040_A71747_rv.mdzip
	A82559_B03040_A71747_rv.mdzip.bak
	Segunda_Entrega/SpryAssets/SpryTabbedPanels.css