asd
skal pulle
pulled
Merge branch 'master' into lokal
asd
added naturegamepng
fixed pull conflicts in nature
fixed merge conflicts
nature mer
asd
pulled jonas sitt arbeid
merged med mitt
added