.
.
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm

Conflicts:
	ldbc_socialnet_dbgen/params.ini
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
.
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm
.
.
.
Merge branch 'master' of https://github.com/ldbc/ldbc_socialnet_bm

Conflicts:
	ldbc_socialnet_dbgen/tools/scalefactor/getStatistics.sh
	ldbc_socialnet_dbgen/tools/scalefactor/minmaxmean_friendships.R
Added extract_sizes file