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

Conflicts:
	TEST/.svn/pristine/09/09683b81ed013c417843b9b6a9b85224b9ff5777.svn-base
	TEST/branches/Vic/BUGBUGBUG