delete
Merge branch 'master' of https://github.com/charlottegaogao/onlineExam

Conflicts:
	instantTest/tests.py
	manage.py
	onlineexam/settings.py
	onlineexam/wsgi.py
	onlineexam/wsgi.pyc