Almost no changes have been made.
Merge branch 'master' of github.com:JakeWaffle/LCSC-Campus-Life
Pushing changes to the Adding of Events before I mess them up with my series of undos.
Merge branch 'master' of github.com:JakeWaffle/LCSC-Campus-Life

Conflicts:
	campuslife.xcodeproj/project.xcworkspace/xcuserdata/superstudent.xcuserdatad/UserInterfaceState.xcuserstate