Adding template logic
Merge branch 'master' of github.com:maxicecilia/django_todo