cosas
Merge remote-tracking branch 'origin/master'

Conflicts:
	core/src/com/mygdx/blacklotus/model/Ninja.java