Merge branch 'redesign' of https://github.com/osmlab/openstreetmap-website into redesign
authorEden Halperin <eden.halperin@gmail.com>
Tue, 5 Nov 2013 21:13:04 +0000 (16:13 -0500)
committerEden Halperin <eden.halperin@gmail.com>
Tue, 5 Nov 2013 21:13:04 +0000 (16:13 -0500)

Trivial merge