prvi push
Merge https://github.com/Sparo/ITAModul7