Re redesign
Merge branch 'gh-pages' of github.com:mapbox/show-me-the-way into gh-pages

Conflicts:
	css/site.css
	js/bundle.js
	js/site.js