Stile per P
Merge branch 'master' of https://github.com/pugia/beanyone

Conflicts:
	public_html/css/main.css