new commit2
Merge origin/master

Conflicts:
	socialNetworkAnalysis/main.cpp