add redcarpet gem to Gemfile
Merge branch 'master' of github.com:sinatra/sinatra

Conflicts:
	Gemfile