people thumbnails all added
Merge remote-tracking branch 'origin/master'

Conflicts:
	presentations/mcgill computer science
orientation/csus-presentation-orientation.pdf
	presentations/mcgill computer science
orientation/csus-presentation-orientation.synctex.gz