hola mundo
Merge remote-tracking branch 'origin/master'

Conflicts:
	MallTopic_News/MallTopic News.v12.suo
	MallTopic_News/MallTopic News/Css/estilos.css
	MallTopic_News/MallTopic News/Scripts/ScriptNewsMT.js
	MallTopic_News/MallTopic News/Views/Home/CentrosComerciales.cshtml
	MallTopic_News/MallTopic News/bin/MallTopic News.dll
	MallTopic_News/MallTopic News/bin/MallTopic News.pdb
	MallTopic_News/MallTopic News/obj/Debug/MallTopic News.dll
	MallTopic_News/MallTopic News/obj/Debug/MallTopic News.pdb
	MallTopic_News/MallTopic
News/obj/Debug/MallTopic_News.csprojResolveAssemblyReference.cache