Cambios
Merge branch 'master' of https://github.com/jdgarrido/taller-2013

Conflicts:
	html/EnergiaSolar/Index.html