commit before pull
Merge branch 'master' of https://github.com/aist2/SocialNetwork/
Merge branch 'master' of https://github.com/aist2/SocialNetwork/

Conflicts:
	SocialNetwork/SocialNetwork.cpp