Merge remote-tracking branch 'upstream/master'
Merge remote-tracking branch 'upstream/master'
Change plot_net_properties to plot_net in control_net_script.py. Make sure clustering coefficients are passed to Mark's function as array, not list.
Merge pull request #8 from rkp8000/master

Fix control_net_script.py