Merge Branch gh-pages

Conflicts:
	_site/assets/build/style.css
	_site/assets/build/style.min.css
	_site/assets/style.css
	assets/build/style.css
	assets/build/style.min.css
	assets/style.css