Merging...
Merge branch 'par_matching' of github.com:Quantomatic/quantomatic into par_matching

Conflicts:
	cosy/fast_graph_enum_parallel.ML