third commit
Merge https://github.com/Filip7/Fizika-sta-drugo