Merge branch 'master' of https://github.com/martinappo/tarkvaratehnikaTeam7
Merge branch 'master' of https://github.com/martinappo/tarkvaratehnikaTeam7