solved conflicts
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	accounts/models.py