Merge branch 'master' of https://github.com/tannersmith1/NewSenior

Conflicts:

SeniorProject.xcodeproj/project.xcworkspace/xcuserdata/tannersmith.xcuse
rdatad/UserInterfaceState.xcuserstate

SeniorProject.xcodeproj/xcuserdata/tannersmith.xcuserdatad/xcdebugger/Br
eakpoints_v2.xcbkptlist
	SeniorProject/VerifyScoreViewController.m
h