Merge branch 'master' of https://github.com/lemonsong/social-network-analysis

Conflicts:
	Students_BIOs2.xml
enron link prediction
Merge branch 'master' of https://github.com/lemonsong/social-network-analysis

Conflicts:
	Students_BIOs2.xml