Modificacion del todo
todo actualizado
Cambio de todo
Merge branch 'master' of https://github.com/cganterh/scaryjerry

Conflicts:
	todo.md
Merge branch 'master' of https://github.com/cganterh/scaryjerry into cristobal

Conflicts:
	todo.md
Merge branch 'master' into cristobal

Conflicts:
	todo.md