save stuff
Merge remote-tracking branch 'origin/combineModel' into combineModel

Conflicts:
	Application/ENG-Schedule-Planner/src/courseModel/CourseModel.java
saving