Semi final
Merge remote-tracking branch 'origin/master'

Conflicts:
	webExam/views.py
Semi final