修好了喔
Merge branch 'master' of github.com:ck520702002/iDoNET

Conflicts:
	donation/models.py
Merge branch 'master' of github.com:ck520702002/iDoNET

Conflicts:
	donation/models.py