就決定是你了編輯頁面!!
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	.gitignore
	db.sqlite3