hej
finishedMerge branch 'master' of github.com:xclose/eda282

Conflicts:
	paper/include/summary.tex