dimtest
Merge remote-tracking branch 'origin/master'

Conflicts:
	index.html
vers 1 tegningen lagt til

Conflicts:
	index.html