my commit
Merge branch 'master' of github.com:TeodorKostadinov/VratsaSoftware

Conflicts:
	Test2/Test2/Test2.csproj