Refactor
Nekaj popravkov
Merge branch 'master' of ssh://github.com/g1smo/prokrastinat