attempt to merge 2
Merge branch 'master' of https://github.com/EvgeniStoyanov/test-SourceControlSystems

Conflicts:
	test.txt