lksjjdf
dkj
dsf
Merge branch 'master' into oli

Conflicts:
	ExamWeb/.idea/workspace.xml
	ExamWeb/Exam/models.pyc
	ExamWeb/ExamWeb/settings.pyc
settt inn próf
dd
sjjs