comment about node scale/color
Merge branch 'master' into soln

Conflicts:
	src/SocialNetwork.java