Pulling from all 6 calendars at the same time - modification of calendarViewController.m
Merge branch 'master' of https://github.com/JakeWaffle/LCSC-Campus-Life

Conflicts:
	campuslife.xcodeproj/xcuserdata/superstudent.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
	campuslife/CalendarViewController.m