Preliminary work on bug fixes related to extra semesters
Merge branch 'master' of https://github.com/eric-chahin/CS5150

Conflicts:
	carousel.php
Merge conflicts