run, actualiza, colisiona
Merge origin/master