fix merge
mettestcreation
Merge branch 'bert' of https://github.com/jan-vandorpe/mctesting into mergecheck
Merge branch 'hendrik' into mergecheck
merconflictfixhelper
fixedbramfiles
answertest.php
shuffletest succeed
hendrik update
question create redirect
Merge branch 'hendrik' of https://github.com/jan-vandorpe/mctesting into thomas
fix lege subcategorie
mergemetbram
Merge branch 'master' into thomas
scores_selecttest - list from DB done
aanpassing templates
Merge branch 'thomas' of https://github.com/jan-vandorpe/mctesting.git into mergemetthomas
scores_selecttest - list from DB done - vardump gone
Merge branch 'thomas' of https://github.com/jan-vandorpe/mctesting.git into mergemetthomas
merge done