Merge
Merge branch 'master' of https://github.com/peteshadbolt/loqc-simulator

Conflicts:
	test_state.py