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

Conflicts:
	html/EnergiaSolar/demo.html
	html/tallercra/test.html