゙ (read the [Japanese Perl users article][]).
+Note that this problem is not specific to Latin scripts. Japanese Mac users often run into the same issue; e.g., with `だ` decomposing into `た` and `゙`. (Read the [Japanese Perl users article][]).
Rsync 3.x to the rescue! From [an answer posted on Server Fault][]:
diff --git a/content/tutorials/creating-a-multilingual-site.md b/content/tutorials/creating-a-multilingual-site.md
index cb63d04d1..51e317d91 100644
--- a/content/tutorials/creating-a-multilingual-site.md
+++ b/content/tutorials/creating-a-multilingual-site.md
@@ -135,7 +135,7 @@ This technique extracts the day, month and year by specifying ``.Date.Day``, ``.
## Create Multilingual Content
-Now you can create markdown content in your languages, in the `content/en` and `content/ja` folders. The frontmatter stays the same on the key side, but the values would be set in each of the languages.
+Now you can create markdown content in your languages, in the `content/en` and `content/ja` folders. The front matter stays the same on the key side, but the values would be set in each of the languages.
## Run Hugo Server or Deploy Commands
diff --git a/data/homepagefeatures.toml b/data/homepagefeatures.toml
new file mode 100644
index 000000000..071035f2a
--- /dev/null
+++ b/data/homepagefeatures.toml
@@ -0,0 +1,29 @@
+[[feature]]
+ name = "Blistering Speed"
+ description = "Golang's baked-in concurrency is the backbone of Hugo's templating. Jettison expensive runtime dependencies, and let Go's incomparable I/O primitives do the work for you. For the first time, your rendering speeds can be measured in micro- and milliseconds."
+ order = 1
+
+[[feature]]
+ name = "Markdown Without Limits"
+ description = "Hugo natively supports GFM, as well as Asciidoc, reStructuredText, and Org-mode through external helpers. Shortcodes, a minimalist intermediary to your templating and content, keeps your source clean, readable, and infinitely extensible."
+ order = 2
+
+[[feature]]
+ name = "Robust Content Management"
+ description = "You need more than front matter to make static scalable. Hugo offers support for taxonomies, unlimited content types, DRY templating, URL management, menus, archetypes, summaries, and so much more without the need for plugins."
+ order = 3
+
+[[feature]]
+ name = "Cross-Platform by Default"
+ description = "As a single binary, Hugo has equally simple installation on OS X, Linux BSD, Windows, Dragonfly BSD, OpenBSD, Plan 9, and any other platform where the Go compiler tool chain can run. Once you decide you want Hugo, simply `go``get` it."
+ order = 4
+
+[[feature]]
+ name = "Multilingual and i18n"
+ description = "International and multilingual sites are often difficult in our new static world. Hugo provides full i18n support for multilinguage sites with the same straightforward and extraordinarily fast experience Hugo users love in their single-language sites."
+ order = 5
+
+[[feature]]
+ name = "A Passionate Community"
+ description = "The gratification of an ultra-fast feedback loop doesn't stop at the templating layer. Our community grows stronger and larger every day. Just one visit to our [forums](https://discuss.gohugo.io) and you'll quickly realize you never need to build a Hugo site alone."
+ order = 6
\ No newline at end of file
diff --git a/data/homepagetweets.toml b/data/homepagetweets.toml
new file mode 100644
index 000000000..4d8cea833
--- /dev/null
+++ b/data/homepagetweets.toml
@@ -0,0 +1,209 @@
+[[tweet]]
+name = "Hans Beck"
+twitter_handle = "@EnrichedGamesHB"
+quote = "Diving deeper into @GoHugoIO. A lot of docs there, top work! But I've the impressed that #gohugo is far easier than its feels from the docs!"
+link = "https://twitter.com/EnrichedGamesHB/status/836854762440130560"
+date = 2017-03-01T00:00:00Z
+
+[[tweet]]
+name = "Alan Richardson"
+twitter_handle = "@eviltester"
+quote = "I migrated the @BlackOpsTesting .com website from docpad to Hugo last weekend. http://gohugo.io/ Super Fast HTML Generation @spf13 "
+link = "https://twitter.com/eviltester/status/553520335115808768"
+date = 2015-01-09T00:00:00Z
+
+[[tweet]]
+name = "Janez Čadež"
+twitter_handle = "@jamziSLO"
+quote = "Building @garazaFRI website in #hugo. This static site generator is soooo damn fast! #gohugo #golang"
+link = "https://twitter.com/jamziSLO/status/817720283977183234"
+date = 2017-01-07T00:00:00Z
+
+[[tweet]]
+name = "Execute"
+twitter_handle = "@executerun"
+quote = "Hah, #gohugo. I was working with #gohugo on #linux but now I realised how easy is to set-up it on #windows. Just need to add binary to #path!"
+link = "https://twitter.com/executerun/status/809753145270272005"
+date = 2016-12-16T00:00:00Z
+
+[[tweet]]
+name = "Baron Schwartz"
+twitter_handle = "@xaprb"
+quote = "Hugo is impressively capable. It's a static site generator by @spf13 written in #golang . Just upgraded to latest release; very powerful. "
+link = "https://twitter.com/xaprb/status/556894866488455169"
+date = 2015-01-18T00:00:00Z
+
+[[tweet]]
+name = "Dave Cottlehuber"
+twitter_handle = "@dch__"
+quote = "I just fell in love with #hugo, a static site/blog engine written by @spf13 in #golang + stellar docs"
+link = "https://twitter.com/dch__/status/460158115498176512"
+date = 2014-04-26T00:00:00Z
+
+[[tweet]]
+name = "David Caunt"
+twitter_handle = "@dcaunt"
+quote = "I had a play with Hugo and it was good, uses Markdown files for content"
+link = "https://twitter.com/dcaunt/statuses/406466996277374976"
+date = 2013-11-29T00:00:00Z
+
+[[tweet]]
+name = "David Gay"
+twitter_handle = "@oddshocks"
+quote = "Hugo is super-rad."
+link = "https://twitter.com/oddshocks/statuses/405083217893421056"
+date = 2013-11-25T00:00:00Z
+
+[[tweet]]
+name = "Diti"
+twitter_handle = "@DitiPengi"
+quote = "The dev version of Hugo is AWESOME! <3 I promise, I will try to learn go ASAP and help contribute to the project! Just too great!"
+link = "https://twitter.com/DitiPengi/status/472470974051676160"
+date = 2014-05-30T00:00:00Z
+
+[[tweet]]
+name = "Douglas Stephen "
+twitter_handle = "@DougStephenJr"
+quote = "Even as a long-time Octopress fan, I’ve gotta admit that this project Hugo looks very very cool"
+link = "https://twitter.com/DougStephenJr/statuses/364512471660249088"
+date = 2013-08-05T00:00:00Z
+
+[[tweet]]
+name = "Hugo Rodger-Brown"
+twitter_handle = "@hugorodgerbrown"
+quote = "Finally someone builds me my own static site generator"
+link = "https://twitter.com/hugorodgerbrown/statuses/364417910153818112"
+date = 2013-05-08T00:00:00Z
+
+[[tweet]]
+name = "Hugo Roy"
+twitter_handle = "@hugoroyd"
+quote = "Finally the answer to the question my parents have been asking: What does Hugo do?"
+link = "https://twitter.com/hugoroyd/status/501704796727173120"
+date = 2014-08-19T00:00:00Z
+
+[[tweet]]
+name = "Daniel Miessler"
+twitter_handle = "@DanielMiessler"
+quote = "Websites for named vulnerabilities should run on static site generator platforms like Hugo. Read-only + burst traffic = static."
+link = "https://twitter.com/DanielMiessler/status/704703841673957376"
+date = 2016-03-01T00:00:00Z
+
+[[tweet]]
+name = "Javier Segura"
+twitter_handle = "@jsegura"
+quote = "Another site generated with Hugo here! I'm getting in love with it."
+link = "https://twitter.com/jsegura/status/465978434154659841"
+date = 2014-05-12T00:00:00Z
+
+[[tweet]]
+name = "Jim Biancolo"
+twitter_handle = "@jimbiancolo"
+quote = "I’m loving the static site generator renaissance we are currently enjoying. Hugo is new, looks great, written in Go"
+link = "https://twitter.com/jimbiancolo/statuses/408678420348813314"
+date = 2013-05-12T00:00:00Z
+
+[[tweet]]
+name = "Jip J. Dekker"
+twitter_handle = "@jipjdekker"
+quote = "Building a personal website in Hugo. Works like a charm. And written in @golang!"
+link = "https://twitter.com/jipjdekker/status/413783548735152131"
+date = 2013-12-19T00:00:00Z
+
+[[tweet]]
+name = "Jose Gonzalvo"
+twitter_handle = "@jgonzalvo"
+quote = "Checking out Hugo; Loving it so far. Like Jekyll but not so blog-oriented and written in go"
+link = "https://twitter.com/jgonzalvo/statuses/408177855819173888"
+date = 2013-12-04T00:00:00Z
+
+[[tweet]]
+name = "Josh Matz"
+twitter_handle = "@joshmatz"
+quote = "A static site generator without the long build times? Yes, please!"
+link = "https://twitter.com/joshmatz/statuses/364437436870696960"
+date = 2013-08-05T00:00:00Z
+
+[[tweet]]
+name = "Kieran Healy"
+twitter_handle = "@kjhealy"
+quote = "OK, so in today's speed battle of static site generators, @spf13's hugo is kicking everyone's ass, by miles."
+link = "https://twitter.com/kjhealy/status/437349384809115648"
+date = 2014-02-22T00:00:00Z
+
+[[tweet]]
+name = "Ludovic Chabant"
+twitter_handle = "@ludovicchabant"
+quote = "Good work on Hugo, I’m impressed with the speed!"
+link = "https://twitter.com/ludovicchabant/statuses/408806199602053120"
+date = 2013-12-06T00:00:00Z
+
+[[tweet]]
+name = "Luke Holder"
+twitter_handle = "@lukeholder"
+quote = "this is AWESOME. a single little executable and so fast."
+link = "https://twitter.com/lukeholder/status/430352287936946176"
+date = 2014-02-03T00:00:00Z
+
+[[tweet]]
+name = "Markus Eliasson"
+twitter_handle = "@markuseliasson"
+quote = "Hugo is fast, dead simple to setup and well documented"
+link = "https://twitter.com/markuseliasson/status/501594865877008384"
+date = 2014-08-19T00:00:00Z
+
+[[tweet]]
+name = "mercime"
+twitter_handle = "@mercime_one"
+quote = "Hugo: Makes the Web Fun Again"
+link = "https://twitter.com/mercime_one/status/500547145087205377"
+date = 2014-08-16T00:00:00Z
+
+[[tweet]]
+name = "Michael Whatcott"
+twitter_handle = "@mdwhatcott"
+quote = "One more satisfied #Hugo blogger. Thanks @spf13 and friends!"
+link = "https://twitter.com/mdwhatcott/status/469980686531571712"
+date = 2014-05-23T00:00:00Z
+
+[[tweet]]
+name = "Nathan Toups"
+twitter_handle = "@rojoroboto"
+quote = "I love Hugo! My site is generated with it now http://rjrbt.io"
+link = "https://twitter.com/rojoroboto/status/423439915620106242"
+date = 2014-01-15T00:00:00Z
+
+[[tweet]]
+name = "Ruben Solvang"
+twitter_handle = "@messo85"
+quote = "#Hugo is the new @jekyllrb / @middlemanapp! Faster, easier and runs everywhere."
+link = "https://twitter.com/messo85/status/472825062027182081"
+date = 2014-05-31T00:00:00Z
+
+[[tweet]]
+name = "Ryan Martinsen"
+twitter_handle = "@popthestack"
+quote = "Also, I re-launched my blog (it looks the same as before) using Hugo, a *fast* static engine. Very happy with it. gohugo.io"
+link = "https://twitter.com/popthestack/status/549972754125307904"
+date = 2014-12-30T00:00:00Z
+
+[[tweet]]
+name = "The Lone Cuber"
+twitter_handle = "@TheLoneCuber"
+quote = "Jekyll is dead to me these days though... long live Hugo! Hugo is *by far* the best in its field. Thanks for making it happen."
+link = "https://twitter.com/TheLoneCuber/status/495716684456398848"
+date = 2014-08-02T00:00:00Z
+
+[[tweet]]
+name = "The Lone Cuber"
+twitter_handle = "@TheLoneCuber"
+quote = "Finally, a publishing platform that's a joy to use. #NoMoreBarriers"
+link = "https://twitter.com/TheLoneCuber/status/495731334711488512"
+date = 2014-08-02T00:00:00Z
+
+[[tweet]]
+name = "WorkHTML"
+twitter_handle = "@workhtml"
+quote = " #Hugo A very good alternative for #wordpress !!! A fast and modern static website engine gohugo.io "
+link = "https://twitter.com/workhtml/status/563064361301053440"
+date = 2015-02-04T00:00:00Z
\ No newline at end of file
diff --git a/dev-and-design-resources/cloud.afdesign b/dev-and-design-resources/cloud.afdesign
new file mode 100644
index 000000000..df1e4c417
Binary files /dev/null and b/dev-and-design-resources/cloud.afdesign differ
diff --git a/dev-and-design-resources/gopher-side_color.afdesign b/dev-and-design-resources/gopher-side_color.afdesign
new file mode 100644
index 000000000..38e17fa35
Binary files /dev/null and b/dev-and-design-resources/gopher-side_color.afdesign differ
diff --git a/dev-and-design-resources/gopher-small-homepage.afdesign b/dev-and-design-resources/gopher-small-homepage.afdesign
new file mode 100644
index 000000000..305e170d7
Binary files /dev/null and b/dev-and-design-resources/gopher-small-homepage.afdesign differ
diff --git a/dev-and-design-resources/gopher-small.afdesign b/dev-and-design-resources/gopher-small.afdesign
new file mode 100644
index 000000000..dec68bb5e
Binary files /dev/null and b/dev-and-design-resources/gopher-small.afdesign differ
diff --git a/dev-and-design-resources/gopherizemehug.afdesign b/dev-and-design-resources/gopherizemehug.afdesign
new file mode 100644
index 000000000..0f7cc21e9
Binary files /dev/null and b/dev-and-design-resources/gopherizemehug.afdesign differ
diff --git a/dev-and-design-resources/hugo-logo-wide.afdesign b/dev-and-design-resources/hugo-logo-wide.afdesign
new file mode 100644
index 000000000..cf410b4b7
Binary files /dev/null and b/dev-and-design-resources/hugo-logo-wide.afdesign differ
diff --git a/dev-and-design-resources/newlogomaybe.afdesign b/dev-and-design-resources/newlogomaybe.afdesign
new file mode 100644
index 000000000..3103a31f7
Binary files /dev/null and b/dev-and-design-resources/newlogomaybe.afdesign differ
diff --git a/layouts/_default/baseof.html b/layouts/_default/baseof.html
index 383bce3dd..cb1687cc9 100644
--- a/layouts/_default/baseof.html
+++ b/layouts/_default/baseof.html
@@ -2,14 +2,18 @@
{{- partial "site-head.html" . -}}
- {{- partial "site-header.html" . -}}
- {{- partial "site-search.html" . -}}
+ {{ block "header" . }}
+ {{- partial "site-header.html" . -}}
+ {{- partial "site-search.html" . -}}
+ {{ end }}
| {{ $value.Name }} | +{{ $value.Name }} | {{ $value.Count }} |