Merge remote-tracking branch 'origin/master'

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

Conflicts:
	Diamanti 1.1
	TAKE A LOOK!
Merge branch 'master' of https://github.com/SoftUni-Test/TEST
Update smth
chao be

eieieiie
Merge remote-tracking branch 'origin/master'

Conflicts:
	Who Wants To Play Heck
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	.gitignore
	BUGBUGBUG
	Hello.txt
	Kubrat-vs-Klitschko-Conflict
	MANDJAAAAAAAAAAAAAA
	Pacha
	TRYYY.txt
	Who Wants To Play Heck
	something
	yolo.txt
	Кфо стаа!
Merge branch 'master' of https://github.com/SoftUni-Test/TEST

Conflicts:
	Who Wants To Play Heck