ignore
Merge branch 'jean's-branch' of https://github.com/ck520702002/TFT_project into jean's-branch

Conflicts:
	.gitignore