Random commit
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel

MErge with Dean's load
Random commit
Merge branch 'combineModel' of https://github.com/neaddean/ENG-Schedule-Planner-App into combineModel