uoči konflikta
Merge branch 'master' of https://github.com/vatoN1/Teretana

Conflicts:
	TeretanaBilderhana/Klijenti/EditovanjeKlijenata.Designer.cs