Länk tillagd
Merge branch 'master' into design

Conflicts:
	test.html