editquickq
editquickq
Merge branch 'master' of github.com:samansmink/informatiekusjes into sam
commit
Merge branch 'master' of github.com:samansmink/informatiekusjes
commit
commit
commit
commit
merge met sam
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir

Conflicts:
	src/index.php
	src/student.php
	src/teacher.php