a
Merge branch 'master' of https://github.com/resilience-me/random_network_generator

Conflicts:
	create_connections.js