Cambios Syncronizados
Arreglo colision
Merge branch 'master' of https://github.com/eddOrnelas/Misoft0_6b