fixman.exe :file_folder:  :fire:
Merge remote-tracking branch 'origin/master'

Conflicts:
	chapters/content/kravspecifikation.tex