3rd commit
Merge branch 'master' of https://github.com/thuraucsy/testing

Conflicts:
	test.txt