Testing commit
Test commit
Merge branch 'github.com/master'

Conflicts:
	test file.txt