some things
pyc
Merge branch 'jupiter' of github.com:yhydhx/debateSys into jupiter

Conflicts:
	debateSNS/settings.pyc