Taking a break, showing the people
Merge branch 'gh-pages' of https://github.com/brianboyko/redesign_jekyll into gh-pages

Conflicts:
	_includes/frontpage.html
	_includes/slider.html
	_site/css/style.css
	_site/index.html
	css/style.css