whatQQ Please enter the commit message for your changes. Lines starting
Merge branch 'master' of https://github.com/ck520702002/iDoNET

Conflicts:
	accounts/forms.py
Merge branch 'master' of https://github.com/ck520702002/iDoNET
good
Merge branch 'master' of https://github.com/ck520702002/iDoNET