before merge change
Merge branch 'master' of github.com:ornithion/o-graph-ml

Conflicts:
	tests/unit_tests/ographml_testsuite.cc