modified into newbranche
update newbrannch
Merge branch 'newbranch'

* newbranch:
  update newbrannch
  modified into newbranche

Conflicts:
	django_test/urls.py