Sesta verzija
Merge branch 'master' of github.com:nikolasp/project