Ver2
Merge branch 'master' of https://github.com/andrepeedosaar/Tarkvaratehnika.git