Merge branch 'abdel' of github.com:samansmink/informatiekusjes

Conflicts:
	src/question.php
Merge branch 'master' of github.com:samansmink/informatiekusjes

Conflicts:
	src/feedback.php
	src/question.php
	src/review.php
	src/studentsession.php
	src/wait.php
Merge branch 'master' of github.com:samansmink/informatiekusjes
quickquestion.php
questionaire.php
questionaire.php
questionaire.php
Merge branch 'master' of github.com:samansmink/informatiekusjes into bjorn
questionaire.php
questionaire.php
Merge branch 'master' of github.com:samansmink/informatiekusjes into bjorn
questionaire.php
quick question
quick question
quick question
questionaire.php
questionaire.php
questionaire.php
questionaire.php
questionaire.php