成功的陳毅
成功的陳毅
拜託不要動到
Merge remote-tracking branch 'origin/master'

Conflicts:
	db.sqlite3
	templates/userena/profile_detail.html
	templates/userena/profile_form.html
新的profile_form
Merge branch 'master' of https://github.com/ck520702002/TFT_project

Conflicts:
	db.sqlite3
開新branch前的profile form
Merge branch 'Kevin's-branch'

Conflicts:
	db.sqlite3
Merge branch 'master' into Kevin's-branch