nearly done
Merge branch 'master' of https://github.com/garrettfrost/csci342project

Conflicts:
	AddSubjectViewController.h
	AddSubjectViewController.m
	Assessments.h
	Assessments.m
	AssessmentsViewController.h
	AssessmentsViewController.m
	Classes.h
	Classes.m
	MagicalRecord/Categories/DataImport/MagicalImportFunctions.h
	MagicalRecord/Categories/DataImport/MagicalImportFunctions.m
	MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSAttributeDescription+MagicalDataImport.m
	MagicalRecord/Categories/DataImport/NSEntityDescription+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSEntityDescription+MagicalDataImport.m
	MagicalRecord/Categories/DataImport/NSNumber+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSNumber+MagicalDataImport.m
	MagicalRecord/Categories/DataImport/NSObject+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSObject+MagicalDataImport.m
	MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSRelationshipDescription+MagicalDataImport.m
	MagicalRecord/Categories/DataImport/NSString+MagicalDataImport.h
	MagicalRecord/Categories/DataImport/NSString+MagicalDataImport.m
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.h
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalAggregation.m
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.h
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalDataImport.m
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.h
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalFinders.m
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRecord.h
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRecord.m
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.h
	MagicalRecord/Categories/NSManagedObject/NSManagedObject+MagicalRequests.m
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.h
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalObserving.m
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.h
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalRecord.m
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.h
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalSaves.m
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.h
	MagicalRecord/Categories/NSManagedObjectContext/NSManagedObjectContext+MagicalThreading.m
	MagicalRecord/Categories/NSManagedObjectModel+MagicalRecord.h
	MagicalRecord/Categories/NSManagedObjectModel+MagicalRecord.m
	MagicalRecord/Categories/NSPersistentStore+MagicalRecord.h
	MagicalRecord/Categories/NSPersistentStore+MagicalRecord.m
	MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.h
	MagicalRecord/Categories/NSPersistentStoreCoordinator+MagicalRecord.m
	MagicalRecord/Core/MagicalRecord+Actions.h
	MagicalRecord/Core/MagicalRecord+Actions.m
	MagicalRecord/Core/MagicalRecord+ErrorHandling.h
	MagicalRecord/Core/MagicalRecord+ErrorHandling.m
	MagicalRecord/Core/MagicalRecord+Options.h
	MagicalRecord/Core/MagicalRecord+Options.m
	MagicalRecord/Core/MagicalRecord+Setup.h
	MagicalRecord/Core/MagicalRecord+Setup.m
	MagicalRecord/Core/MagicalRecord+ShorthandSupport.h
	MagicalRecord/Core/MagicalRecord+ShorthandSupport.m
	MagicalRecord/Core/MagicalRecord+iCloud.h
	MagicalRecord/Core/MagicalRecord+iCloud.m
	MagicalRecord/Core/MagicalRecord.h
	MagicalRecord/Core/MagicalRecord.m
	MagicalRecord/Core/MagicalRecordShorthand.h
	MagicalRecord/CoreData+MagicalRecord.h
	README
	README.md
	ScheduleViewController.h
	ScheduleViewController.m
	StudentModel.xcdatamodeld/StudentModel.xcdatamodel/contents
	TimetableViewController.h
	TimetableViewController.m
	WAMViewController.h
	WAMViewController.m
	sample/sample.xcodeproj/project.pbxproj
	sample/sample/AppDelegate.h
	sample/sample/AppDelegate.m
	sample/sample/Default-568h@2x.png
	sample/sample/Default.png
	sample/sample/Default@2x.png
	sample/sample/ViewController.h
	sample/sample/ViewController.m
	sample/sample/en.lproj/InfoPlist.strings
	sample/sample/en.lproj/MainStoryboard_iPad.storyboard
	sample/sample/en.lproj/MainStoryboard_iPhone.storyboard
	sample/sample/main.m
	sample/sample/sample-Info.plist
	sample/sample/sample-Prefix.pch
	studentHelperApp.xcodeproj/project.pbxproj
	studentHelperApp.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	studentHelperApp.xcodeproj/project.xcworkspace/xcuserdata/Ryan.xcuserdatad/UserInterfaceState.xcuserstate
	studentHelperApp.xcodeproj/project.xcworkspace/xcuserdata/cs321kw1a.xcuserdatad/UserInterfaceState.xcuserstate
	studentHelperApp.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/studentHelperApp.xcscheme
	studentHelperApp.xcodeproj/xcuserdata/Ryan.xcuserdatad/xcschemes/xcschememanagement.plist
	studentHelperApp.xcodeproj/xcuserdata/cs321kw1a.xcuserdatad/xcdebugger/Breakpoints.xcbkptlist
	studentHelperApp.xcodeproj/xcuserdata/cs321kw1a.xcuserdatad/xcschemes/studentHelperApp.xcscheme
	studentHelperApp.xcodeproj/xcuserdata/cs321kw1a.xcuserdatad/xcschemes/xcschememanagement.plist
	studentHelperApp/AppDelegate.h
	studentHelperApp/AppDelegate.m
	studentHelperApp/Default-568h@2x.png
	studentHelperApp/Default.png
	studentHelperApp/Default@2x.png
	studentHelperApp/ViewController.h
	studentHelperApp/ViewController.m
	studentHelperApp/en.lproj/InfoPlist.strings
	studentHelperApp/en.lproj/MainStoryboard_iPad.storyboard
	studentHelperApp/en.lproj/MainStoryboard_iPhone.storyboard
	studentHelperApp/main.m
	studentHelperApp/studentHelperApp-Info.plist
	studentHelperApp/studentHelperApp-Prefix.pch
almost done