html blocks, flex slider
Merge remote-tracking branch 'origin/gh-pages'

Conflicts:
	sass/_common.sass