Caída de la gota y colision
Merge branch 'Xiannie' of https://github.com/dariso/CI-1430 into Xiannie