.
Merge branch 'master' of https://github.com/carloamaglio/PHA
.
Merge branch 'master' of https://github.com/carloamaglio/PHA

Conflicts:
	jhome/bin/.gitignore