Fixed a sentence or two and added some text to the conclusion
Merge branch 'master' of github.com:mickvangelderen/modern-computer-architecture

Conflicts:
	documents/report/main.pdf
	documents/report/main.tex