UPDATE-django
Merge branch 'master' of https://github.com/brenden17/infinity