Merge branch 'master' of github.com:sinatra/sinatra.github.com

Conflicts:
	_includes/README.html
	_includes/README.zh.html

_includes/README.html

@@ -301,13 +301,23 @@ <h3>Custom Route Matchers</h3>
       @captures = Match.new([])
     end
 
+<<<<<<< HEAD
     def match(str)
       @captures unless @except === str
     end
   end
 
   def all_but(pattern)
     AllButPattern.new(pattern)
+=======
+  def initialize(except)
+    @except   = except
+    @captures = Match.new([])
+  end
+
+  def match(str)
+    @captures unless @except === str
+>>>>>>> cb0c8bddc098d0435c2b999d5e3071889163a1c7
   end
 
   get all_but(&quot;/index&quot;) do

_includes/README.zh.html

@@ -287,13 +287,30 @@ <h3>自定义路由匹配器</h3>
       @captures = Match.new([])
     end
 
+<<<<<<< HEAD
     def match(str)
       @captures unless @except === str
     end
   end
 
   def all_but(pattern)
     AllButPattern.new(pattern)
+=======
+<p>如上显示，Sinatra内置了对于使用字符串和正则表达式作为路由匹配的支持。
+但是，它并没有只限于此。
+你可以非常容易地定义你自己的匹配器:</p>
+
+<pre>class AllButPattern
+  Match = Struct.new(:captures)
+
+  def initialize(except)
+    @except   = except
+    @captures = Match.new([])
+  end
+
+  def match(str)
+    @captures unless @except === str
+>>>>>>> cb0c8bddc098d0435c2b999d5e3071889163a1c7
   end
 
   get all_but(&quot;/index&quot;) do

wild.markdown

@@ -5,8 +5,8 @@ layout: default
 
 *NOTE:* Feel free to fork
 [Sinatra's website on GitHub](http://github.com/sinatra/sinatra.github.com)
-and add your own entry to the `wild.markdown` file. Just push and we'll take
-care of the rest.
+and add your own entry to the `wild.markdown` file. Just push and send a pull request.
+We'll take care of the rest.
 
 Applications {#apps}
 ------------
@@ -84,6 +84,7 @@ Applications {#apps}
 - [Brakes](http://github.com/rdnck76/brakes) a simple sinatra app for hosting static html on heroku.
 - [Fundry - Crowdfunding for Software Development](http://fundry.com) - Fundry is designed around software projects, helping developers get paid for developing new features, and enabling your community to pledge to get the features they want. The site and API (coming soon) is all written in Sinatra.
 - [Picky](http://github.com/floere/picky) - a fast & clever semantic search engine.
+- [Headhunter](http://headhunter.heroku.com) - giving Twitter profile pics a permanent URL
 
 Libraries and extensions {#libs}
 ------------------------