fiks
Merge branch 'master' of https://github.com/khlieng/AndroidOblig3