Rida
Merge branch 'master' of https://github.com/martehaustdal/gittest
Merge branch 'master' of https://github.com/martehaustdal/gittest