Merge branch 'master' of github.com:samansmink/informatiekusjes into rob
Merge branch 'master' of github.com:samansmink/informatiekusjes into rob
commit
breakline in teacher.php
commit
commit
commit
commit
commit
commit
commit
commit
commit
commit
Merge branch 'master' of github.com:samansmink/informatiekusjes into rob
teacher design
Merge branch 'master' of github.com:samansmink/informatiekusjes
Merge branch 'rob'

Conflicts:
	src/teacher.php
Merge branch 'master' of github.com:samansmink/informatiekusjes into sam
typo gefixt