Caspars ændringer
Merge branch 'master' of https://github.com/SW1B2-28a/P1_SlideShow into Caspar

Conflicts:
	master.pdf
	master.tex
Merge pull request #4 from SW1B2-28a/Caspar

Caspars ændringer