comentar
c
m
Merge branch 'master' of https://github.com/dariso/CI-1430
Merge branch 'master' of https://github.com/dariso/CI-1430 into kalam
mapa
FPS en pantalla
Delete hoja1.tif
Merge branch 'master' into PruebasScrolling
Creacion de interfaz que es implementada por los objetos de juego
Merge pull request #83 from dariso/interfazObjeto

Creacion de interfaz que es implementada por los objetos de juego
temporal
Merge branch 'master' of https://github.com/dariso/CI-1430
temporal
Merge branch 'master' of https://github.com/dariso/CI-1430 into kalam

Conflicts:
	PuddleSlide/core/src/main/java/com/puddle_slide/game/GameScreen.java
	PuddleSlide/core/src/main/java/com/puddle_slide/game/PuasScreen.java
tercera seccion
Merge branch 'Meli'
espacio
conflictos
tercer nivel