Test 3 and final. Conflict seems to be from xcode being open while merging because UserInterfaceSate is different.
Merge remote-tracking branch 'origin/workingbranch'

Conflicts:
	AOC1Project2/AOC1Project2.xcodeproj/project.xcworkspace/xcuserdata/elijahfreestone.xcuserdatad/UserInterfaceState.xcuserstate