Merge branch 'master' of https://github.com/antifrize/NMlab5

Conflicts:
	.idea/workspace.xml
	ImplicitGraphModel.py
	MixedGraphModel.py