Update with the new calendar.json
Merge branch 'master' of github.com:GrinnellAppDev/Grinnell-Events-iOS