Merge pull request #2 from davedesch/Markdown

Markdown
Intentional Yahoo Error
Fixes conflicts