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