Fixed some formatting.

Escaped some characters that have special meaning in Markdown. Also changed typographical quotes to boring straight ones so that strings can be copied and pasted.
merging conflicted file