Initial commit for Project 2 with new single view app
Initial commit for Project 2 with new single view app
Added Base, Factory, and 3 subclasses from Project 1 with supporting code in viewcontoller
Added Base, Factory, and 3 subclasses from Project 1 with supporting code in viewcontoller
Ran into SIGABRT exception with no time to investigate. Rebuilt project 2 from scratch again
Ran into SIGABRT exception with no time to investigate. Rebuilt project 2 from scratch again
Ran into SIGABRT exception with no time to investigate. Rebuilt project 2 from scratch again
Ran into SIGABRT exception with no time to investigate. Rebuilt project 2 from scratch again
Merge remote-tracking branch 'origin/workingbranch'

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