handske
Merge remote-tracking branch 'origin/master'

Conflicts:
	mittpresentation/presentation.pdf