Merging Files
Merge remote-tracking branch 'origin/master'

Conflicts:
	08.2_GeometryMeasurementII.tex
	Student Manual 2.pdf
	Student Manual 2.tex