new db
Merge remote-tracking branch 'origin/Kevin's-branch' into TingYu'sBranch
Merge remote-tracking branch 'origin/master' into TingYu'sBranch

Conflicts:
	db.sqlite3
post
post ok
最新版
TRY
Merge branch 'jean's-branch'
add some ing
now
ignore
逃出夾縫
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	.gitignore
	db.sqlite3
now2
11
db
db
FIXED PROFILE DETAILS
fixed post create
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3