local changes
Merge branch 'master' of github.com:ornithion/o-graph-ml
Merge branch 'master' of github.com:ornithion/o-graph-ml

Conflicts:
	build/gmock-1.6.0/CMakeFiles/gmock.dir/build.make
	build/gmock-1.6.0/CMakeFiles/gmock.dir/flags.make
	build/gmock-1.6.0/CMakeFiles/gmock_main.dir/build.make
	build/gmock-1.6.0/CMakeFiles/gmock_main.dir/flags.make
	build/gmock-1.6.0/gtest/CMakeFiles/gtest.dir/build.make
	build/gmock-1.6.0/gtest/CMakeFiles/gtest.dir/flags.make
	build/gmock-1.6.0/gtest/CMakeFiles/gtest_main.dir/build.make
	build/gmock-1.6.0/gtest/CMakeFiles/gtest_main.dir/flags.make
Merge branch 'master' of github.com:ornithion/o-graph-ml
minor corrections in files