ispravljen bug #71
Merge branch 'master' of https://github.com/arnela/SI2013tim11.git