new file:   OnlineJudge/OnlineJudge/__init__.py
	new file:   OnlineJudge/OnlineJudge/settings.py
	new file:   OnlineJudge/OnlineJudge/urls.py
	new file:   OnlineJudge/OnlineJudge/wsgi.py
	new file:   OnlineJudge/manage.py
	new file:   readme
Merge branch 'master' of https://github.com/iceafish/OnlineJudgeSite.git

Conflicts:
	OnlineJudge/OnlineJudge/urls.py