mergetesti go
Merge branch 'master' of https://github.com/CamelCaseIT/testa.git

Conflicts:
	foobar.txt