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

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