nieuwe branch
nieuwe branch
nieuwe branch
nieuwe branch
sam.txt
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir
yadvir
hello
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir

Conflicts:
	src/test.php
Merge branch 'abdel' of github.com:samansmink/informatiekusjes

Conflicts:
	src/test.php
Merge branch 'abdel' of github.com:samansmink/informatiekusjes into yadvir
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir
Merge branch 'abdel' of github.com:samansmink/informatiekusjes into yadvir
Merge branch 'master' of github.com:samansmink/informatiekusjes into yadvir

Conflicts:
	src/oude code/index.html
hi
Teacher question af (AJAX/Javascript)
Merge branch 'yadvir' of https://github.com/samansmink/informatiekusjes into abdel
Vorige fout hersteld
Merge branch 'yadvir' of https://github.com/samansmink/informatiekusjes into abdel