new server2
Merge branch 'master' of https://github.com/snowkitty/django_exp1

Conflicts:
	manage.py