Merge branch 'kalam'

Conflicts:
	PuddleSlide/core/src/main/java/com/puddle_slide/game/MyContactListener.java
conflictos
clase hojassalta