Deleted old project started new same errors
Merge branch 'master' of https://github.com/littlemeg27/AOC2

Conflicts:

AOC2Project2/AOC2Project2.xcodeproj/project.xcworkspace/xcuserdata/raven
margret.xcuserdatad/UserInterfaceState.xcuserstate
	AOC2Project3/AOC2Project3.xcodeproj/project.pbxproj

AOC2Project3/AOC2Project3.xcodeproj/project.xcworkspace/xcuserdata/raven
margret.xcuserdatad/UserInterfaceState.xcuserstate

AOC2Project3/AOC2Project3.xcodeproj/xcuserdata/ravenmargret.xcuserdatad/
xcschemes/AOC2Project3.xcscheme

AOC2Project3/AOC2Project3.xcodeproj/xcuserdata/ravenmargret.xcuserdatad/
xcschemes/xcschememanagement.plist
	AOC2Project3/AOC2Project3/AOC2AppDelegate.h
	AOC2Project3/AOC2Project3/AOC2AppDelegate.m
	AOC2Project3/AOC2Project3/AOC2ViewController.h
	AOC2Project3/AOC2Project3/AOC2ViewController.m
	AOC2Project3/AOC2Project3/en.lproj/AOC2ViewController_iPad.xib
	AOC2Project3/AOC2Project3/main.m
	AOC2Project3/AOC2Project3Tests/AOC2Project3Tests.h
	AOC2Project3/AOC2Project3Tests/AOC2Project3Tests.m