aa
Merge branch 'master' of github.com:geenux/algogeom
Merge branch 'master' of github.com:geenux/algogeom
bqlf
Merge branch 'master' of github.com:geenux/algogeom

Conflicts:
	src/scene.h
	src/test_scene.cpp