Broke more stuff
Merge branch 'master' of https://github.com/ianjjohnson/ScheduleBuilder

Conflicts:
	src/gui/ClassPanel.java
	src/gui/ClassWindow.java