Added My Portfolio Site which is built using Middleman
Get search input's align right
Merge pull request #245 from minipai/develop

Get search input's align right
add note to put templates inside localizable to use full template localization.
Merge pull request #246 from paulcpederson/master

add note to put templates inside localizable
Organize files follow navigation
Merge pull request #247 from minipai/develop

Organize files follow navigation
Added my portfolio site which is built using middleman
Merge pull request #248 from Abhra1992/master

I added my portfolio which is built using middleman
Update blog documentation
Doc the new middleman-blog feature I just added
Merge pull request #249 from bhollis/blog

Update blog documentation
Add better sprockets docs
Documented sitemap_resorce.url vs sitemap_resource.path for link_to
Reverted to Ruby 1.8 hashes syntax for consitency
Merge pull request #251 from lolmaus/patch-1

Documented sitemap_resorce.url vs sitemap_resource.path for link_to
Merge remote-tracking branch 'upstream/master' into localized

Conflicts:
	source/advanced/localization.html.markdown
	source/basics/blogging.html.markdown
	source/basics/helpers.html.markdown
	source/index.html.erb
	source/layouts/_nav.erb