working on aside
Merge branch 'gh-pages' of https://github.com/DellGDC/sherpa into gh-pages
fixed height issue with waypoint

Conflicts:
	new_site/components.html
Merge branch 'gh-pages' of https://github.com/DellGDC/sherpa into gh-pages

Conflicts:
	new_site/components.html
	new_site/scaffolding.html