conclusion added
Merge branch 'master' of https://github.com/raynald/ETH_BBBigData