Voor remote
Test conflict
Merge branch 'andre'

Conflicts:
	conflict.txt
Merge branch 'master' of https://github.com/bkummel/git-playground