kykjh
Merge branch 'master' of https://github.com/energysistem/manuals

Conflicts:
	42260-Tower3/en/SUMMARY.md
	42260-Tower3/es/SUMMARY.md