Merge branch 'example/custom-routes-proxying' of github.com:ijjk/next…

….js into example/custom-routes-proxying

# Conflicts:
#	examples/custom-routes-proxying/package.json

examples/custom-routes-proxying/README.md

@@ -1,6 +1,6 @@
 # Custom Routes Proxying Example
 
-This example shows the most basic example using Next.js' new custom routes feature to proxy requests to an upstream server. We have 3 pages: `pages/index.js`, `pages/about.js`, and `pages/hello/[slug].js`. All of these pages will be matched against before requests are proxied to the upstream server.
+This example shows the most basic example using Next.js' new custom routes feature to proxy requests to an upstream server. We have 3 pages: `pages/index.js`, `pages/about.js`, and `pages/hello/[slug].js`. All of these pages will be matched against Next.js and any other path will be proxied to the upstream server.
 
 This approach is very helpful when you are trying to incrementally migrate your application to Next.js but still need to fallback to an existing application. You can add pages to your Next.js application one-by-one and then for non-migrated pages Next.js can proxy to the existing application until they are able to be migrated.