test

testvam
test2

tedqwdqwd
qdw

dqw
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hello.txt
Merge branch 'master' of https://github.com/SoftUni-Test/TEST
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	Hello.txt
testvam

dqwdqwd
asd

asd
asd

dqwdw
test

tewew ewr
novfail

dqw
chagew

fwef
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	BUGBUGBUG
	Diamanti
	Hello.txt
	Hello2.txt
Merge branch 'master' of https://github.com/SoftUni-Test/TEST
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	BUGBUGBUG
	Diamanti
Merge branch 'master' of https://github.com/SoftUni-Test/TEST
fqwef

ewfwe
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	Diamanti
Merge branch 'master' of https://github.com/SoftUni-Test/TEST