Various

Honestly: unknown changes...
Merge branch 'master' of https://github.com/Carmol/todos