testing loading
Merge branch 'combineModel' of github.com:neaddean/ENG-Schedule-Planner-App into combineModel
fixing stuff
Conflicts:
	Application/ENG-Schedule-Planner/src/courseModel/CourseModel.java
Merge branch 'combineModel' of github.com:neaddean/ENG-Schedule-Planner-App into combineModel
fixing stuff
Conflicts:
	Application/ENG-Schedule-Planner/src/courseModel/CourseModel.java