'a'
Merge branch 'master' of https://github.com/samwangcai/django-notes

Conflicts:
	01.file_install.txt
	02.config_and_run.txt
	03.run_django_in_eclips.txt
	04.package_app.txt
Merge branch 'master' of https://github.com/samwangcai/django-notes