Merge branch 'asd-branch'

Conflicts:
	test3.txt