final 2
Merge branch 'master' of https://github.com/Dominoo/BigData-thesis