Merge remote-tracking branch 'origin/master'

Conflicts:
	Report/main.aux
	Report/main.toc
changes
now