Django: Modified .gitignore
Merge branch 'django'