commit
Merge branch 'master' of github.com:jufang/django_todos