diskusion
Merge branch 'master' of https://github.com/stagnation/vetenskapshistoriaPatent

Conflicts:
	delar/nutid-usa.tex