pyc Delete
Merge branch 'master' of github.com:xiaohuajiao123/couse_web

Conflicts:
	class_site/models.pyc
	course_web/settings.pyc