Challenge Code Corrupt

The challenge code provided for the Mac App Challenge in Chapter 20 is corrupt and will not compile. There appears to be a lot of code from the BullsEye project embedded in at least one of the files.

Thanks for reporting, looks like there was a git conflict problem, but it should all be fine now.