first commit
Merge https://github.com/yuyomagico/Tarea2_elo330