commit per conflict
Merge branch 'master' of https://github.com/GiulioGx/Jama.git