Beginning to adjust the iPhone storyboard but need to update Github.
Merge branch 'master' of https://github.com/JakeWaffle/LCSC-Campus-Life

Conflicts:
	campuslife.xcodeproj/project.xcworkspace/xcuserdata/superstudent.xcuserdatad/UserInterfaceState.xcuserstate
	campuslife/Base.lproj/Main_iPad.storyboard