add redcarpet gem to Gemfile
Merge pull request #669 from burningTyger/master

update German Readme and some small English Readme fixes
Merge branch 'master' of github.com:sinatra/sinatra

Conflicts:
	Gemfile
server can have different defaults now
update Requirement section
fix markup
fix section hierarchy in readme
update list of http methods
make AcceptEntry behave like string
fix test for Ruby 2.0
avoid test name collision
avoid to_enum warning on 2.0
use render_app instead of mock_app in test
make use mime_type returns a string or nil
Fix integration tests for Net HTTP Server.
net-http-server logs to $stderr!
correcting spelling

s/plus sing/plus sign/
Merge pull request #672 from erikj/master

correcting spelling
net-http-server is not a dependency when RUBY_VERSION == 1.8.7 || RUBY_ENGINE =~ /jruby|rbx/
Merge pull request #671 from patriciomacadden/fix-integration-tests

Fix integration tests for Net HTTP Server.