Testing if auto sync works!
Gitmerge.php fix
New test
update gitmerge
Test 3
Update merge script
alweer een test
update
Test
update
Testje
Update
update script
Remove cache from git
update
Merge pull request #1 from gouwestadmm/master

update