Not sure what this is.
Merge remote-tracking branch 'origin/master'

Conflicts:
	CSMS/src/Controllers/CourseSectionController.java
	CSMS/src/GUI/JPanelNewSection.java