TODO DE PRUEBA
Merge branch 'master' of https://github.com/energysistem/manuals.git

Conflicts:
	basic-guide/images/Thumbs.db