Merge pull request #2 from Bekjarce/master

Promena u db klasata i main strana
Merge pull request #2 from blitzkrieg2306/master

Merge pull request #2 from Bekjarce/master
Merge pull request #1 from Bekjarce/master

Merge