Nov feature.
Merge branch 'master' of github.com:mstajdohar/projekt2