Cleaned up
commit
Code becommentariëerd
commit
commit
commit
commit
commit
Merge conflicts solved

Dat hoop ik tenminste
commit
Merge branch 'master' of github.com:samansmink/informatiekusjes into rob
Merge branch 'master' of https://github.com/samansmink/informatiekusjes into abdel
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir
Merge branch 'master' of github.com:samansmink/informatiekusjes

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