Added to Geometry II
Merge remote-tracking branch 'origin/master'

Conflicts:
	Student Manual 2.log