Challenge 11 Final Draft   Link to Apollo's merge conflict video.   Link to Follow-Up video.   Add the challenge at the bottom.   Link to a reflog tutorial.   Clean up some formatting.
Challenge 11 Final Draft
  Link to Apollo's merge conflict video.
  Link to Follow-Up video.
  Add the challenge at the bottom.
  Link to a reflog tutorial.
  Clean up some formatting.

commitmas/30-days-of-commitmas-2015