test3
test 4
Merge branch 'master' of github.com:mickfuzz/mutant1test

Conflicts:
	test3.txt
teste
Merge branch 'testing'