Merge branch 'master' of github.com:BlackLacost/django_test

Conflicts:
	templates/base.html
Merge branch 'master' of github.com:BlackLacost/django_test

Conflicts:
	templates/base.html