short commit
Merge branch 'fastkdtree-SS13-group1' of https://github.com/happah-graphics/happah into fastkdtree-SS13-group1