VERSION 3
VERSION 3
Merge branch 'master' of https://github.com/wietchie/testRepo

Conflicts:
	buku/myDocument.txt