Fjrede pdf-filen
Merge branch 'master' of ssh://github.com/Munken/Laser

Conflicts:
	slides/nonlinearslides.pdf