initial import
Merge branch 'master' of https://github.com/PG6100/prosjekt9-uke16