使用django发送邮件的尝试；
Merge branch 'master' of http://github.com/hjwsm1989/learn

Conflicts:
	python/django/learn_django/learn_django/settings.py

解决pull的冲突文件