db
deleted db test
Merge branch 'master' into jean's-branch

Conflicts:
	.gitignore
	db.sqlite3
解決gitignore
db problem
ignore
Merge branch 'jean's-branch' of https://github.com/ck520702002/TFT_project into jean's-branch

Conflicts:
	.gitignore
edit_profile
Merge branch 'jean's-branch'
逃出夾縫
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	.gitignore
	db.sqlite3