Added some text to introduction + source to preface
Merge remote-tracking branch 'origin/master'

Conflicts:
	bibliography.bib
Merge branch 'master' of https://github.com/sw701e14/report