删掉不要的东西
Merge remote-tracking branch 'origin/master'

Conflicts:
	project/forms.py