Commit before pull
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

MErge from Nate's category
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

merge with dean's save
Not throwing exception with load
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

Merge with someone