testing mergetool
Merge branch 'master' of github.com:smanne/test

Conflicts:
	test.txt