Final commit with some cleanup
Merge remote-tracking branch 'origin/workingbranch'

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