Fixed a missing backtick literal
Syntax to markdown from RDoc.
File extension update for changes.
Merge branch 'convert-korean-to-md' of https://github.com/yb66/sinatra

Testing out the Korean MD conversion
Korean Readme test conversion

fixed some syntaxes and indentations
Revert "Plus symbols in the URL should be converted to spaces when considered as param values. Closes #463."

This reverts commit babe1e84230c57ac2b998324521509a0853131d3.

Conflicts:
	lib/sinatra/base.rb

Fixes #638
add test for + behavior
update CHANGES
Merge pull request #647 from kgrz/master

Added a missing backtick literal in the German README
add @yb66 to CHANGES
Merge branch 'master' of github.com:sinatra/sinatra
Merge branch 'master', remote branch 'upstream/master'
Added a div tag around the ToC that makes it easy to hide in sinatra's website intro.html
Merge pull request #650 from kgrz/master

Adding a div tag around the ToC in english Readme
Update README.md
Update README.md
bump dependency versions
Merge branch 'master' of github.com:sinatra/sinatra
Convert spanish README to Markdown
changed Hungarian README to markdown.