Merge pull request #2 from satmari/master

from new to master
chanege in new branch
proba sa new promeniti master
Merge branch 'master' into new
Merge pull request #3 from satmari/new

Spajanje mastera sa new