lol
Merge branch 'master' of https://github.com/Throkul823/GradeBook

Conflicts:
	.DS_Store

GradeBook.xcodeproj/project.xcworkspace/xcuserdata/major.xcuserdatad/Use
rInterfaceState.xcuserstate