Merge branch 'master' of https://github.com/djordon/queueing-tool

Conflicts:
	network/queue_network.py