Changed the introduction
Expanded the conclusions
Test
Merge branch 'master' of https://github.com/twan-dollevoet/TestForPresentation

Conflicts:
	Paper/paper.tex
Merge remote-tracking branch 'origin/master'

Conflicts:
	Paper/paper.tex