Parti francois
fix
Merge branch 'pr/14'

Conflicts:
	alpha/site/base-full-size.html
	alpha/site/base-page.html
	alpha/site/css/base-full-size.css
	alpha/site/css/base-page.css
	alpha/site/js/main.js
	alpha/site/scss/base-full-size.scss
	alpha/site/scss/base-page.scss