Conflicting Edit
Merge branch 'master' of https://github.com/BrionyStudent/Test_1

Conflicts:
	test.txt