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

Conflicts:
	src/test.php
test
Merge branch 'master' of https://github.com/samansmink/informatiekusjes into abdel
Javascript testing
Javascript
javascript
javascriptemundo
javascript
test