yes
Merge branch 'master' of https://github.com/aeternas/quiz

Conflicts:
	quiz/basesess.php