Introduction edited

Minor fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	report/report.pdf
	report/report.tex