Update 2014-January-Calculator.markdown

escape delimiter examples
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.
Fixed conflict
Ignore *.orig
merging conflicted file
Delimiter parser fragment
Spelling
Clojure code for first kata, Jan 2014; added comments to the source
Merge pull request #5 from g-d-strong/master

Delimiter parser fragment
merging in changes since I cloned the repository
Add an F# solution for Calculator kata
Added string-calculator.hs: one Haskell solution.
Merge pull request #6 from PatrickMcDonald/Calculator

Add an F# solution for Calculator kata
add erlang solution for calculator kata
added a suite of tests, using the Midje library (and Leiningen plugin)
Merge pull request #7 from philip-clarke/master

add erlang solution for calculator kata