no idea
Merge remote-tracking branch 'origin/master'

Conflicts:
	KopterBygger/public_html/stylesheet.css
	KopterBygger/public_html/videoopptak.html