boh
Merge branch 'master' of github.com:gbuonc/PYM

Conflicts:
	dist/_borghese.html
	dist/_dallapalma.html
	dist/_italialowcost.html
	dist/_monda.html
	dist/_oldani.html
	dist/_pesatori.html
	dist/assets/css/pym.css.map
	dist/assets/js/pym-desktop.js
	dist/index.html