First pages
Merge branch 'master' into gh-pages

Conflicts:
	css/gumby.css
	index.html
	sass/_custom.scss
Update
Update
Tweaks to map section