insert views.py
new commit
Merge branch 'test'

* test:
  new commit
  insert views.py

Conflicts:
	django_test/urls.py