不知道打什麼

這個有動到黃靜那夜
兩個小時後的commit
Merge branch 'Kevin's-branch'

Conflicts:
	db.sqlite3
Merge branch 'jean's-branch'

Conflicts:
	templates/userena/profile_form.html
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/models.py
	db.sqlite3
ignore
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	accounts/models.py
	db.sqlite3
解決衝突
solved conflicts
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	accounts/models.py
solved conflicts
Merge branch 'jean's-branch'

Conflicts:
	accounts/models.py
	db.sqlite3
Merge branch 'master' into jean's-branch

Conflicts:
	.gitignore
	db.sqlite3