我上了
fix i up
Merge remote-tracking branch 'origin/master'

Conflicts:
	accounts/forms.pyc
	iDoNET/urls.pyc
	iDoNET/views.pyc
	templates/home.html
	templates/main_base.html