d
Merge branch 'master' of https://github.com/Burger35/bgtest

Conflicts:
	test/Textfile.txt.TXT