Merge remote-tracking branch 'origin/TingYu'sBranch' into jean's-branch
？
new
Merge branch 'jean's-branch'

Conflicts:
	.gitignore
	TFT_project/urls.py
	TFT_project/views.py
	db.sqlite3
	templates/discuss.html
	templates/main_base.html
	templates/pastpost.html
	templates/post_create.html
	templates/userena/profile_detail.html
	templates/userena/profile_form.html