clase hojassalta
Merge branch 'master' of https://github.com/dariso/CI-1430 into kalam
hojabasica separada de hojacurva
Merge branch 'master' of https://github.com/dariso/CI-1430 into kalam

Conflicts:
	PuddleSlide/android/assets/Shapes/tronco.json
	PuddleSlide/core/src/main/java/com/puddle_slide/game/Gota.java
	PuddleSlide/core/src/main/java/com/puddle_slide/game/Manzana.java
shape json tronco derecho
Colisión con gota
Prueba con troncos en troncoScreen
hoja derecha
quitando hoja
Merge pull request #31 from dariso/hongo

Colisión con gota (hongo)
Merge branch 'troncoConBloader'

Conflicts:
	Borrado tronco.json
Sonido Tronco
Merge branch 'Meli'

Conflicts:
	PuddleSlide/core/src/main/java/com/puddle_slide/game/Tronco.java
Arreglos
sprite hoja
Hoja saltarina, sonido manzana