Cambios de estilos y links (parent locations) Memo
Resuelto

Merge branch 'master' of https://github.com/estrategasdigitales/purin

Conflicts:
	rss_feed.xml