added a line in order to test how merge works
Merge branch 'master' of https://github.com/poli-pin/Others

Conflicts:
	test.txt