Merge branch 'CalZoneVUB/master'
Merge branch 'CalZoneMaster' into MyMaster
Merge branch 'MyMaster' into Scheduling
deleted line from gitignore