maybe an error
Merge branch 'combineModel' of github.com:neaddean/ENG-Schedule-Planner-App into combineModel
maybe a problem
moved courses.xml