Make frontpage
Merge branch 'master' of https://github.com/finninde/fellesprosjekt