changed title
Merge branch 'master' of https://github.com/cattanica/git-exercise

Conflicts:
	social_network.py
Merge branch 'master' of github.com:jdannberg/git-exercise
add some more friends