Tog bort skräpfil
Merge branch 'vecka20' into pontus
Centrerade "trademark" längst ner i footern.
Merge branch 'design' into pontus