Lagt inn copyright statements.
merge conflict fix