imagenes ya jalan
comit
otra vez
comittt
Merge branch 'master' of https://github.com/vampaynani/oda

Conflicts:
	js/u1a1.js