sass wip before pulling LC's push
Merge branch 'master' of https://github.com/copyflake/village-wordpress
slide hero styles wip
Merge branch 'master' of https://github.com/copyflake/village-wordpress

Conflicts:
	wp-content/themes/html5reset/_layout.scss
	wp-content/themes/html5reset/header.php
	wp-content/themes/html5reset/style.css

merge of LC's slideshow classes with CF's hero styles