Merge remote-tracking branch 'origin/_post' into _home
Avance Home
home + post

Conflicts:
	_site/css/giornata.css
	_site/css/pyxis.css
	css/giornata.css
	css/pyxis.css
Merge branch '_home' into _post