Merge branch 'feature/jekyll_styling' into feature/bi-lingual-posts

Conflicts:
	_includes/themes/nflabs-sb/default.html