Updated readme and todo.
Merge branch 'master' of https://github.com/isaacazuelos/blog