Indentation Fixes.
Merge remote-tracking branch 'origin/master'

Conflicts:
	Uoft CourseShopp.html
	lifestyle.html