added oppivi function
Merge branch 'master' of github.com:enaukkarinen/GitPart3 into r2_oppivi
master updated
Merge branch 'master' into r2_oppivi