maybe new
Merge remote-tracking branch 'origin/TingYu'sBranch' into TingYu'sBranch

Conflicts:
	TFT_project/urls.py
	TFT_project/views.py
	accounts/views.py
	templates/post_create.html
	templates/teacher/teacher_info.html
	templates/teacher/teacher_info2.html