Fucking update!
Merge branch 'origin/master'

Conflicts:
	Report/main.tex
Merge branch 'origin/master'