avances todos
Merge branch 'todos'