agregar linea
Merge branch 'master' of https://github.com/energysistem/manuals.git

Conflicts:
	c7titanium/primermanual.md