Changed fiskmås -> fiskamås
Fixed merge conflict on line 6/index.php