commit del conflitto risolto come merged
Merge branch 'master' of https://github.com/rfenarol/bigdata.git