Updates
Update
Merge remote-tracking branch 'origin/master'

Conflicts:
	Student Manual 2.log
	Student Manual 2.pdf
	Student Manual 2.synctex.gz